Fix a NPE exception
Merge branch 'master' of github.com:geosdi/geo-platform