Fixed unchecked null with nul-lsensitive mappings. Potentially fixes #223.