Better error handling.

Change-Id: I5d249c02a8669e6e5bdd69b46a934b47015fc535
1 file changed