Merge "Add try/catch to handle UnsupportedOperationException" into main