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