Fixes #18 - just make exception an option