Begin adding error handling
Added test for web service error