Improve error handling. am: 1c3a4f469f am: 26ec9bd81e am: 4d49d279eb
am: 0d67f5f8b9

Change-Id: I2f75b467bce834c6bcda829cdf1d26c6ee5f999f