- Removed debug output
- Added the exception back in