Removed references to empty strings as null values