diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 2144fbcc786..b74358e54f4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -1734,7 +1734,9 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
   @Override
   public void stop(final String msg) {
     try {
-      this.rsHost.preStop(msg);
+    	if (this.rsHost != null) {
+    		this.rsHost.preStop(msg);
+    	}
       this.stopped = true;
       LOG.info("STOPPED: " + msg);
       // Wakes run() if it is sleeping