Feature - Exception catching simplification

This quick PR simplifies the way we catch and handle exceptions even further beyond #217. This is more of internal code cleanup than anything. :smile: