Issue #114

Exception was not being handled cleanly as it existed outside the
appropriate try...catch block