1 files changed, 7 insertions, 1 deletions

diff --git a/linden/indra/newview/lltoolgrab.cpp b/linden/indra/newview/lltoolgrab.cpp
index 502e2be..b56e762 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -180,6 +180,12 @@ BOOL LLToolGrab::handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mas
                 llinfos << "LLToolGrab handleObjectHit " << mMouseDownX << "," << mMouseDownY << llendl;
         }
 
+        if (NULL == objectp) // unexpected
+        {
+                llwarns << "objectp was NULL; returning FALSE" << llendl;
+                return FALSE;
+        }
+
         if (objectp->isAvatar())
         {
                 if (gGrabTransientTool)
@@ -198,7 +204,7 @@ BOOL LLToolGrab::handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mas
         // objectp = (LLViewerObject *)objectp->getRoot();
 
         LLViewerObject* parent = objectp->getRootEdit();
-        BOOL script_touch = (objectp && objectp->flagHandleTouch()) || (parent && parent->flagHandleTouch());
+        BOOL script_touch = (objectp->flagHandleTouch()) || (parent && parent->flagHandleTouch());
 
         // Clicks on scripted or physical objects are temporary grabs, so
         // not "Build mode"