diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 54eb99304ab..b910c09a57b 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -807,7 +807,9 @@ public class CoreContainer
     SolrCore newCore = core.reload(solrLoader);
     // keep core to orig name link
     String origName = coreToOrigName.remove(core);
-    coreToOrigName.put(newCore, origName);
+    if (origName != null) {
+      coreToOrigName.put(newCore, origName);
+    }
     register(name, newCore, false);
   }