Better error handling
Minor version bump