Time to try violent things to be sure we don't miss exceptions...
Merge pull request #35 from agueganno/minor-improvements

Time to try violent things to be sure we don't miss exceptions...