map bugs found by FindBugs
Merge pull request #1696 from enesakar/master-findbugs

map bugs found by FindBugs