diff --git a/source/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java b/source/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java
index 66e0633755..174be1d91a 100644
--- a/source/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java
+++ b/source/java/org/alfresco/repo/web/scripts/TenantWebScriptServlet.java
@@ -73,6 +73,24 @@ public class TenantWebScriptServlet extends WebScriptServlet
         	WebScriptServletRuntime runtime = getRuntime(req, res);
             runtime.executeScript();
         }
+        catch (IllegalStateException e) 
+        {
+           if(e.getMessage().contains("getOutputStream() has already been called for this response"))
+           {
+               if(logger.isDebugEnabled())
+               {
+                   logger.warn("Client has cut off communication", e);
+               }
+               else
+               {
+                   logger.warn("Client has cut off communication");
+               }
+           }
+           else
+           {
+               throw e;
+           }
+        }		
         finally
         {
             // clear threadlocal