Improvements to null checks and custom exceptions when null passed to single object map methods