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

Change-Id: Ic121ada8b651bad3054ad187423ee9fa4f3ce53f