Protect against crash #1070