removed unnecessary exception handling