Fix issue #54 - Exception handling