fixed severity issue and model-getters are now null-pointer save
small addition to last commit
new header
Merge branch 'master' into searchConstruction