Protection against null values in maps.
Merge pull request #1 from boneill42/master

Protection against null values in maps.