Add exception when context doesn't contain a model during execution
Merge branch 'master' into 3.2.0