Ensure `_resolve_model` does not return `None`
Merge pull request #2086 from beck/doug/blow-up-with-bad-models

Ensure _resolve_model does not return None