add ability to remove NSNull while mapping