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

Change-Id: I55a0eb324d18c7081acb6387b51c2fdf4f7b2a62