Improve error reporting

Follow-up of upstream changes:
- cherry-pick(github.com/GoogleCloudPlatform/kubernetes):72c922668fefc1cf671d9c9e38ebf22a22a80dcf
- cherry-pick(github.com/GoogleCloudPlatform/kubernetes):397240aebe029b6ff5c64fa4f04f5524b053f115