[FIX] Simplification of exception handling (issue #12)