Merge "Handle UnsupportedOperationException"