fixed severity issue and model-getters are now null-pointer save