Error handling and version bump