Removing try/cathers which break normal functionality

Change-Id: I98780f177be25087d55f3832046e12e8b56c4bb6