Added check for "" case in map.

And moved checks into a separate method.
Flipped some expressions and fixed indentation
Merge pull request #21 from SERG-Delft/empty-string-in-map

Added check for "" case in map.