handle nils better
update to match source site