Cleaned up the code a bit
- Removed some unnecessary exception throwing