=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/JCloudsFileResourceContentStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/JCloudsFileResourceContentStore.java	2015-10-12 15:46:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/JCloudsFileResourceContentStore.java	2015-10-12 17:31:22 +0000
@@ -353,13 +353,16 @@
         {
             Throwable cause = rte.getCause();
 
-            if ( ( cause == null ) || !( cause instanceof UserPrincipalNotFoundException ) )
+            if ( cause != null && cause instanceof UserPrincipalNotFoundException )
+            {
+                //  Intentionally ignored exception which occurs with JClouds on non-English
+                //  Windows installations while trying to resolve the "Everyone" group.
+                log.debug( "Ignored UserPrincipalNotFoundException as a workaround for bug with JClouds filesystem provider on Windows" );
+            }
+            else
             {
                 throw rte;
             }
-            // Else:
-            //  Intentionally ignored exception which occurs with JClouds on
-            //  non-English Windows installation while trying to resolve the "Everyone" group.
         }
 
         return etag;