Bug 894388 - Fix errors during startup in B2G desktop