[RFR] Avoid to map null rawEntry

Fixes #150