Deffensive coding
Merge branch 'master' of github.com:gecos-team/gecoscc-ui