=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java	2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java	2014-10-09 20:46:49 +0000
@@ -126,7 +126,13 @@
 
         for ( String id : selectedList )
         {
-            DataSet dataSet = dataSetService.getDataSet( Integer.parseInt( id ) );
+            DataSet dataSet = dataSetService.getDataSet( id );
+
+            if ( dataSet == null )
+            {
+                //TODO fix this better. Currently some are UID, some ID. Should all be the same.
+                dataSet = dataSetService.getDataSet( Integer.parseInt( id ) );
+            }
 
             group.getDataSets().add( dataSet );
         }