Bug fix for result set with null values