TRUNK-3950: changes check from empty string to null and empty string