Better handling of exceptions
1.0.21