Better error handling in the server, new messages