More error handling on the client