update to client crash handling