Handle crashes better