Bug 1051813 - Add potential crash guard