handle nils better