prevent exceptions when incorrect geo entity types set sent
Merge branch 'hotfix-0.5.1' into develop