diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 0bbc821ae96cf6d1628186977a468220dd33233c..0d4c3babc10e3606734781f98de7cfe5cf552527 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -481,7 +481,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
 
 - (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
 {
-    if ([aString class] == NSClassFromString(@"NSConcreteMutableAttributedString"))
+	if ([aString isKindOfClass:NSClassFromString(@"NSConcreteMutableAttributedString")])
     {
         if (mMarkedTextAllowed)
         {
diff --git a/indra/newview/llpanelprofilelegacy.cpp b/indra/newview/llpanelprofilelegacy.cpp
index 6ad2a0abfda7cb4e5ae3bf18908d4ced5fde4d90..1c11716d9e6942b101ea0978e18cfcdb8ce821b4 100644
--- a/indra/newview/llpanelprofilelegacy.cpp
+++ b/indra/newview/llpanelprofilelegacy.cpp
@@ -696,6 +696,7 @@ void LLPanelProfileLegacy::LLPanelProfilePicks::openPickInfo()
 	if (selected_value.isUndefined()) return;
 	
 	LLPickItem* pick = static_cast<LLPickItem*>(mPicksList->getSelectedItem());
+	if (!pick) return;
 	LLSD params;
 	params["pick_id"] = pick->getPickId();
 	params["avatar_id"] = pick->getCreatorId();