Fix NPE
Merge branch 'development' of github.com:InformationIntegrationGroup/Web-Karma into development