add try-catch at geo
Merge branch 'develop'