diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
index a6a3cf9cc2b..e4ff70fd1ee 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
@@ -210,7 +210,7 @@ org.apache.hadoop.util.StringUtils;
 <%args>
     CacheConfig cacheConfig;
 </%args>
-<%if cacheConfig == null %>
+<%if cacheConfig == null || cacheConfig.getBlockCache() == null %>
 <p>CacheConfig is null</p>
 <%else>
 <table class="table table-striped">
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
index 22a35462a79..732df4b2d54 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
@@ -45,12 +45,17 @@ import org.mockito.Mockito;
 import com.google.common.collect.Lists;
 import com.google.protobuf.RpcController;
 import com.google.protobuf.ServiceException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.io.hfile.CacheConfig;
 
 /**
  * Tests for the region server status page and its template.
  */
 @Category({RegionServerTests.class, SmallTests.class})
 public class TestRSStatusServlet {
+  private static final Log LOG = LogFactory.getLog(TestRSStatusServlet.class);
   private HRegionServer rs;
   private RSRpcServices rpcServices;
 
@@ -79,6 +84,12 @@ public class TestRSStatusServlet {
     Mockito.doReturn("fakequorum").when(zkw).getQuorum();
     Mockito.doReturn(zkw).when(rs).getZooKeeper();
 
+    // Fake CacheConfig
+    LOG.warn("The " + HConstants.HFILE_BLOCK_CACHE_SIZE_KEY + " is set to 0");
+    CacheConfig cacheConf = Mockito.mock(CacheConfig.class);
+    Mockito.doReturn(null).when(cacheConf).getBlockCache();
+    Mockito.doReturn(cacheConf).when(rs).getCacheConfig();
+    
     // Fake MasterAddressTracker
     MasterAddressTracker mat = Mockito.mock(MasterAddressTracker.class);
     Mockito.doReturn(fakeMasterAddress).when(mat).getMasterAddress();