more robust error handling and version bump