diff --git a/src/Model/modelmgr.cxx b/src/Model/modelmgr.cxx
index 142ff6a7b..3235f6190 100644
--- a/src/Model/modelmgr.cxx
+++ b/src/Model/modelmgr.cxx
@@ -208,7 +208,12 @@ FGModelMgr::bind ()
 void
 FGModelMgr::unbind ()
 {
-    _models->removeChangeListener(_listener.get());
+    // work-around for FLIGHTGEAR-37D : crash when quitting during
+    // early startup
+    if (!_listener) {
+        _models->removeChangeListener(_listener.get());
+    }
+
     _listener.reset();
     _models.clear();
 }