diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp
index dd6c77ca7d1ace427a03bb199197812f1fd293e7..6273f10c697f80ebf435bc4d4654fee3ce396df5 100644
--- a/indra/newview/llwatchdog.cpp
+++ b/indra/newview/llwatchdog.cpp
@@ -91,7 +91,11 @@ void LLWatchdogEntry::start()
 
 void LLWatchdogEntry::stop()
 {
-	LLWatchdog::getInstance()->remove(this);
+    // this can happen very late in the shutdown sequence
+    if (! LLWatchdog::wasDeleted())
+    {
+        LLWatchdog::getInstance()->remove(this);
+    }
 }
 
 // LLWatchdogTimeout