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

Change-Id: Iae7f0a7c3f66545a98de7d3901ac71622acc1c4a