Add more error state transitions (client)