possible fix for NPE in manage maps
Changed code to find exact problem of manage map crashes
Merge pull request #1016 from Bars107/master

Changed code to find exact problem of manage map crashes