Fixed no body on error crash