Added a little safety for when we're not sure if we've got a plain objec...

...t or a model object