diff --git a/src/App/ComplexGeoData.h b/src/App/ComplexGeoData.h
index 40b7d3fe27..0eeb086f77 100644
--- a/src/App/ComplexGeoData.h
+++ b/src/App/ComplexGeoData.h
@@ -296,7 +296,10 @@ public:
     // NOTE: getElementHistory is now in ElementMap
     long getElementHistory(const MappedName & name,
                            MappedName *original=nullptr, std::vector<MappedName> *history=nullptr) const {
-        return _elementMap->getElementHistory(name, Tag, original, history);
+        if ( _elementMap != nullptr ) {
+            return _elementMap->getElementHistory(name, Tag, original, history);
+        }
+        return 0;
     };
 
     void setMappedChildElements(const std::vector<Data::ElementMap::MappedChildElements> & children);