Added exception cases for the map view.  Fix for #158.
Merge pull request #166 from ChrisGrant/master

Added exception cases for the map view.  Fix for #158.