diff --git a/indra/newview/aoengine.cpp b/indra/newview/aoengine.cpp
index d6d7cb88ae75f88ce5d1dfe0962694bcf3245902..e29c581308fc70ba9fd9572681a5778f8599fa84 100644
--- a/indra/newview/aoengine.cpp
+++ b/indra/newview/aoengine.cpp
@@ -1469,7 +1469,10 @@ void AOEngine::update()
 				{
 					mDefaultSet = newSet;
 					mCurrentSet = newSet;
-					mSetChangedSignal(mCurrentSet->getName());
+					if (mCurrentSet)
+					{
+						mSetChangedSignal(mCurrentSet->getName());
+					}
 				}
 				else
 				{
@@ -1633,7 +1636,10 @@ void AOEngine::selectSet(AOSet* set)
 	}
 
 	mCurrentSet = set;
-	mSetChangedSignal(mCurrentSet->getName());
+	if (mCurrentSet)
+	{
+		mSetChangedSignal(mCurrentSet->getName());
+	}
 
 	if (mEnabled)
 	{