Add some extra info around possible nils