Greatly simplified error handling following the update on the Units webservice API