Issue #16 - Properly log exceptions
Issue #16 - Properly log exceptions