Not reviewed, fix for crash on launch bug in last patch.