Fixed a crash because the schemas were still referencing a model that was removed.
Merge branch 'working' into dev