Better exception handling
Version 2.0.4