Improve error handling.
am: 1c3a4f469f

Change-Id: Idec3785b0fc7c33067739c05974733e8291b3e25