diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
index 5acfb74dd1e7..e1e7caa783c5 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -368,8 +368,7 @@ if (fqtn != null && master.isInitialized()) {
   </tr>
 <%
     }
-
-  if (quota.hasThrottle()) {
+  if (quota != null && quota.hasThrottle()) {
     List<ThrottleSettings> throttles = QuotaSettingsFactory.fromTableThrottles(table.getName(), quota.getThrottle());
     if (throttles.size() > 0) {
 %>
@@ -401,8 +400,8 @@ if (fqtn != null && master.isInitialized()) {
   </tr>
 <%
     }
-  }
-  }
+   }
+ }
 %>
 </table>
 <h2>Table Schema</h2>