Better error handling and server update