Add null and empty support