Small change to compare null instead of empty