Fixing issue #103 - Incorrect exception throwing