I think you can just pipe a `null` entity into the mapper and it will still work as expected. That should simplify the double check here a little.