Fix crash at startup

Carl Schwanrequested to merge
work/carl/possibly-fix-crash into master

BUG: 461747 BUG: 461882 Fix #42 (closed)

Edited by Carl Schwan

Merge request reports