diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 2bf46175ee9aea5d9bd366b53ae10c713c744c34..5ac79668d2455139307ec26ee57b2dd3b84f1d3e 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -248,7 +248,7 @@ void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)
 	{
 		mAgentStateSlot.disconnect();
 	}
-	LLPathingLib::getInstance()->cleanupResidual();
+	if ( LLPathingLib::getInstance() ) { LLPathingLib::getInstance()->cleanupResidual(); }
 	LLFloater::onClose(pIsAppQuitting);
 	setHeartBeat( false );
 }