Removed do-nothing exception handling