Added more error handling for server failures
Added more detailed logging on errors
Merged with origin