Fix static analyzer warnings about nil values in dictionary
Merge pull request #122 from denivip/fix-nil-dictionary-values

Fix static analyzer warnings about nil values in dictionary