Add guard against null on add/set
Merge pull request #8 from epigrams/master

Bug fix