Prevent nullpointer.
Fix model emx files
Merge pull request #2088 from erwinwinder/master

Fixes for modelregistry