Make mapping check more thorough.

Per [74327104](https://www.pivotaltracker.com/story/show/74327104).  Was getting script error; turned out to be just an issue of needing to check for whether the .instance exists, which should be handled the same way.