Issue #16 - Properly log exceptions