=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java	2014-10-07 03:59:22 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java	2014-10-10 11:20:01 +0000
@@ -257,9 +257,9 @@
         {
             dataSets = new ArrayList<>( dataSetService.getAllDataSets() );
         }
-        else
+        else if ( user != null )
         {
-            dataSets = new ArrayList<>( currentUserService.getCurrentUser().getUserCredentials().getAllDataSets() );
+            dataSets = new ArrayList<>( user.getUserCredentials().getAllDataSets() );
         }
 
         Set<DataElementCategoryCombo> categoryComboSet = new HashSet<>();