Handle nils better