Reject nils. tidy up a bit, to be more clear