diff --git a/framework/quota/src/org/apache/cloudstack/quota/constant/QuotaTypes.java b/framework/quota/src/org/apache/cloudstack/quota/constant/QuotaTypes.java
index 50ecd813fe2..36910f47741 100644
--- a/framework/quota/src/org/apache/cloudstack/quota/constant/QuotaTypes.java
+++ b/framework/quota/src/org/apache/cloudstack/quota/constant/QuotaTypes.java
@@ -94,6 +94,10 @@ public class QuotaTypes extends UsageTypes {
     }
 
     static public String getDescription(int quotaType) {
-        return quotaTypeMap.get(quotaType).getDescription();
+        QuotaTypes t = quotaTypeMap.get(quotaType);
+        if (t != null) {
+            return t.getDescription();
+        }
+        return null;
     }
 }