Hopefully fixed nullpointer
Merge branch 'dev-model' into dev