diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 80f68621697fe9487b0529ed1cf5e53b815b795d..c2729fa19bd395d4d3fd5ca936c0eb55911d17e4 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -299,7 +299,7 @@ void LLLandmarksPanel::onTeleport()
 	}
 
 	LLFolderViewEventListener* listenerp = current_item->getListener();
-	if (listenerp->getInventoryType() == LLInventoryType::IT_LANDMARK)
+	if (listenerp && listenerp->getInventoryType() == LLInventoryType::IT_LANDMARK)
 	{
 		listenerp->openItem();
 	}
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 46262832dcddf47347fec80ff247abf4b560ee5c..1e510a2d7b424bbe172e7e4c8a4a47726134f54a 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -584,6 +584,13 @@ void LLPanelPlaces::onTeleportButtonClicked()
 	{
 		if (mPlaceInfoType == LANDMARK_INFO_TYPE)
 		{
+			if (mItem.isNull())
+			{
+				llwarns << "NULL landmark item" << llendl;
+				llassert(mItem.notNull());
+				return;
+			}
+
 			LLSD payload;
 			payload["asset_id"] = mItem->getAssetUUID();
 			LLSD args;