Bug 889635 - Avoid startup error