=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/SetSelectedOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/SetSelectedOrganisationUnitAction.java	2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/SetSelectedOrganisationUnitAction.java	2014-10-10 11:42:22 +0000
@@ -93,16 +93,14 @@
 
         OrganisationUnit unit = organisationUnitService.getOrganisationUnit( id );
 
-        if ( unit == null )
+        if ( unit != null )
         {
-            throw new RuntimeException( "OrganisationUnit with id " + id + " doesn't exist" );
+            selectedUnits = new HashSet<>( 1 );
+            selectedUnits.add( unit );
+    
+            selectionManager.setSelectedOrganisationUnits( selectedUnits );
         }
-
-        selectedUnits = new HashSet<>( 1 );
-        selectedUnits.add( unit );
-
-        selectionManager.setSelectedOrganisationUnits( selectedUnits );
-
+        
         return SUCCESS;
     }
 }