Bug 919532 - Make sure we don't lose state when quitting early without being notified; r=yoric