Minor refactoring

Removed some unnecessary exception handling