Fixed bug in dynamic maplocator. Added validations

Correct message, comments, code cleaning left.