Fix for #49 and removed more exception handling being used for flow control which could have caused exceptions being wrongly swallowed
Merge pull request #50 from neonbunny/master

Fix for #49 and removed more exception handling being used for flow control