Don't pass null through to populateValues when extracting an empty entity