Correct error handling

https://github.com/WindowsAzure/azure-sdk-tools-xplat/issues/552