Add error handling.

Change-Id: Icf244900c17b4d47b19dfb3208dd7e7b5c61bf0e
2 files changed