diff --git a/source/java/org/alfresco/repo/usage/ContentUsageImpl.java b/source/java/org/alfresco/repo/usage/ContentUsageImpl.java
index 4f42251314..b0d5f500c2 100644
--- a/source/java/org/alfresco/repo/usage/ContentUsageImpl.java
+++ b/source/java/org/alfresco/repo/usage/ContentUsageImpl.java
@@ -37,6 +37,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.usage.ContentQuotaException;
 import org.alfresco.service.cmr.usage.ContentUsageService;
 import org.alfresco.service.cmr.usage.UsageService;
 import org.alfresco.service.namespace.NamespaceService;
@@ -296,6 +297,7 @@ public class ContentUsageImpl implements ContentUsageService,
                               ", usage=" + currentSize +
                               ", quota=" + quotaSize);
             }
+            throw new ContentQuotaException("User quota exceeded");
         }
         
         NodeRef personNodeRef = personService.getPerson(userName);
diff --git a/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java b/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java
index 08a266b86e..696eaf256c 100644
--- a/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java
+++ b/source/java/org/alfresco/repo/usage/UserUsageTrackingComponent.java
@@ -148,7 +148,7 @@ public class UserUsageTrackingComponent
          
                     if (logger.isDebugEnabled()) 
                     {
-                        logger.debug("... cleared usage for " + count + " users");
+                        logger.debug("... cleared usages for " + count + " users");
                     }
                 }
             }
@@ -160,7 +160,7 @@ public class UserUsageTrackingComponent
                 {
                     if (logger.isDebugEnabled()) 
                     {
-                        logger.debug("Enabled - calculate usages for all users (without usage) ...");
+                        logger.debug("Enabled - calculate missing usages ...");
                     }
 
                     RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
@@ -195,7 +195,7 @@ public class UserUsageTrackingComponent
          
                     if (logger.isDebugEnabled()) 
                     {
-                        logger.debug("... calculated usage for " + userNames.size() + " users");
+                        logger.debug("... calculated missing usages for " + userNames.size() + " users");
                     }
                 }
                 else