Clean up validation to handle nils