diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java
index 07a90f6db950..4266c0a75c7d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java
@@ -73,7 +73,8 @@ public MetricsRegionServer(MetricsRegionServerWrapper regionServerWrapper, Confi
 
     // Create hbase-metrics module based metrics. The registry should already be registered by the
     // MetricsRegionServerSource
-    metricRegistry = MetricRegistries.global().get(serverSource.getMetricRegistryInfo()).get();
+    metricRegistry = MetricRegistries.global().get(serverSource.getMetricRegistryInfo()).orElseThrow(
+      ()->new IllegalStateException("metricRegistry is null"));
 
     // create and use metrics from the new hbase-metrics based registry.
     bulkLoadTimer = metricRegistry.timer("Bulkload");
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerTableMetrics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerTableMetrics.java
index a9a7d75bfeaa..c80fd2f8573d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerTableMetrics.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerTableMetrics.java
@@ -35,7 +35,8 @@ public RegionServerTableMetrics(boolean enableTableQueryMeter) {
     latencies = CompatibilitySingletonFactory.getInstance(MetricsTableLatencies.class);
     if (enableTableQueryMeter) {
       queryMeter = new MetricsTableQueryMeterImpl(MetricRegistries.global().
-        get(((MetricsTableLatenciesImpl) latencies).getMetricRegistryInfo()).get());
+        get(((MetricsTableLatenciesImpl) latencies).getMetricRegistryInfo()).orElseThrow(
+        ()-> new IllegalStateException("metricRegistry is null")));
     }
   }