diff --git a/web/api/src/main/java/org/onosproject/rest/resources/MetricsWebResource.java b/web/api/src/main/java/org/onosproject/rest/resources/MetricsWebResource.java
index 31f23dd..d16c62c 100644
--- a/web/api/src/main/java/org/onosproject/rest/resources/MetricsWebResource.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/MetricsWebResource.java
@@ -28,6 +28,7 @@
 import com.google.common.collect.TreeMultimap;
 import org.onlab.metrics.MetricsService;
 import org.onosproject.rest.AbstractWebResource;
+import org.onlab.util.ItemNotFoundException;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -44,6 +45,8 @@
 @Path("metrics")
 public class MetricsWebResource extends AbstractWebResource {
 
+    private static final String E_METRIC_NAME_NOT_FOUND = "Metric Name is not found";
+
     private final MetricsService service = get(MetricsService.class);
     private final ObjectNode root = mapper().createObjectNode();
 
@@ -84,6 +87,10 @@
         MetricFilter filter = metricName != null ? (name, metric) -> name.equals(metricName) : MetricFilter.ALL;
         TreeMultimap<String, Metric> matched = listMetrics(service, filter);
 
+        if (matched.isEmpty()) {
+            throw new ItemNotFoundException(E_METRIC_NAME_NOT_FOUND);
+        }
+
         matched.asMap().get(metricName).forEach(m -> {
             metricNode.set(metricName, codec(Metric.class).encode(m, this));
         });
