Some crash avoidance