=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java	2012-10-25 14:58:43 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java	2012-10-25 16:59:25 +0000
@@ -236,7 +236,7 @@
     @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE )
     public PeriodType getPeriodType()
     {
-        return period.getPeriodType();
+        return period != null ? period.getPeriodType() : null;
     }
 
     @JsonProperty

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapController.java	2012-10-25 16:27:03 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapController.java	2012-10-25 16:59:25 +0000
@@ -70,7 +70,7 @@
 @Controller
 @RequestMapping( value = MapController.RESOURCE_PATH )
 public class MapController
-    extends AbstractCrudController<MapView>
+    extends AbstractCrudController<Map>
 {
     public static final String RESOURCE_PATH = "/maps";
 
@@ -195,7 +195,7 @@
     @RequestMapping( value = { "/{uid}/data", "/{uid}/data.png" }, method = RequestMethod.GET )
     public void getMap( @PathVariable String uid, HttpServletResponse response ) throws Exception
     {
-        MapView mapView = getEntity( uid );
+        MapView mapView = mappingService.getMapView( uid );
 
         renderMapViewPng( mapView, response );
     }