fix exception handling
Release 1.0.1