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