Merge \"Improved error handling.\" into nyc-dev
am: bbd27419ac

Change-Id: I1cdfd89997adee7d68191b66bab9e437a8be7800