Remove unnecessary exception handling