error handling

Change-Id: I7ad612a814865fabe518aa4e08a49c357eacd0cd