Fixing cascading exception handlers
Merge pull request #175 from HipsterJazzbo/fix-exception-cascading

Fixing cascading exception handlers