diff --git a/api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/util/MetricTypeTextConverter.java b/api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/util/MetricTypeTextConverter.java
index <HASH>..<HASH> 100644
--- a/api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/util/MetricTypeTextConverter.java
+++ b/api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/util/MetricTypeTextConverter.java
@@ -33,8 +33,10 @@ public class MetricTypeTextConverter {
             return "gauges";
         } else if(mt == MetricType.COUNTER) {
             return "counters";
-        } else {
+        } else if(mt == MetricType.AVAILABILITY) {
             return mt.getText();
+        } else {
+            throw new RuntimeException("Unsupported type " + mt.getText());
         }
     }
 }
Throw RuntimeException if new type is not added here also