Improve unsupported data type handling as per codedance's suggestions.