diff --git a/indra/newview/alaoengine.cpp b/indra/newview/alaoengine.cpp
index 0a90060c5afac7c8b00764d0831a2c6a309adb4e..c60ebe2f67b17b2f4f66008d39bdeb8876ec4e7f 100644
--- a/indra/newview/alaoengine.cpp
+++ b/indra/newview/alaoengine.cpp
@@ -1345,7 +1345,10 @@ void ALAOEngine::selectSet(ALAOSet* set)
 	}
 
 	mCurrentSet = set;
-	mSetChangedSignal(mCurrentSet->getName());
+	if(mCurrentSet)
+	{
+		mSetChangedSignal(mCurrentSet->getName());
+	}
 
 	if (mEnabled)
 	{