Changed error handling to not throw exceptions, but return the map from the server