=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java	2014-01-08 11:18:13 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java	2014-01-08 11:47:35 +0000
@@ -115,7 +115,7 @@
     {
         response.setContentType( CONTENT_TYPE_XML );
 
-        boolean isSingleDataValueSet = dataSet.size() == 1 && orgUnit.size() == 1;
+        boolean isSingleDataValueSet = dataSet.size() == 1 && period != null && orgUnit.size() == 1;
         
         if ( isSingleDataValueSet )
         {