Added check for null of maps
Merge pull request #259 from B3nRa/issue#252

Added check for null of maps