Bug 889635 - Avoid startup error
Merge pull request #10809 from lodr/bug-889635-avoid-startup-error

Bug 889635 - Avoid startup error
r=arcturus