catch exceptions

Change-Id: If01a3d5ca544a2308c1398b93001a4598e8cd68f