MAINT-5435 missing null check

2 files changed, 6 insertions, 2 deletions

diff --git a/indra/newview/llfloatersidepanelcontainer.cpp b/indra/newview/llfloatersidepanelcontainer.cpp
index aee20ff706..c7218ad9d5 100755
--- a/indra/newview/llfloatersidepanelcontainer.cpp
+++ b/indra/newview/llfloatersidepanelcontainer.cpp
@@ -69,7 +69,11 @@ void LLFloaterSidePanelContainer::closeFloater(bool app_quitting)
 			LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance*>(getPanel("appearance"));
 			if ( panel_appearance )
 			{
-				panel_appearance->getWearable()->onClose();
+				LLPanelEditWearable *edit_wearable_ptr = panel_appearance->getWearable();
+				if (edit_wearable_ptr)
+				{
+					edit_wearable_ptr->onClose();
+				}
 				panel_appearance->showOutfitsInventoryPanel();
 			}
 		}
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index ea7cf82674..86135ee6e8 100755
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -198,7 +198,7 @@ void LLSidepanelAppearance::updateToVisibility(const LLSD &new_visibility)
 
 		if (is_outfit_edit_visible || is_wearable_edit_visible)
 		{
-			const LLViewerWearable *wearable_ptr = mEditWearable->getWearable();
+			const LLViewerWearable *wearable_ptr = mEditWearable ? mEditWearable->getWearable() : NULL;
 			if (!wearable_ptr)
 			{
 				LL_WARNS() << "Visibility change to invalid wearable" << LL_ENDL;