diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 5e86c290cdf895c3b5b765dde461a402fbdd35aa..43deac60d92188f1bc5a0017b43aa416593084a4 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -657,8 +657,7 @@ bool LLToolPie::teleportToClickedLocation()
     LLViewerObject* objp = mHoverPick.getObject();
     LLViewerObject* parentp = objp ? objp->getRootEdit() : NULL;
 
-    if (objp->getAvatar() == gAgentAvatarp
-        || objp == gAgentAvatarp) // ex: nametag
+    if (objp && (objp->getAvatar() == gAgentAvatarp || objp == gAgentAvatarp)) // ex: nametag
     {
         // Don't teleport to self, teleporting to other avatars is fine
         return false;