Better error handling, version bump