Handle nil or empty uniquing property keys