Fix two potential crash locations (the latter one already did, once)