1 files changed, 5 insertions, 3 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index c44fe3a..532b777 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -471,9 +471,11 @@ void LLAgent::cleanup()
 
         setSitCamera(LLUUID::null);
 
-        mAvatarObject->markDead();
-
-        mAvatarObject = NULL;
+        if (mAvatarObject)
+        {
+                mAvatarObject->markDead();
+                mAvatarObject = NULL;
+        }
         if(mLookAt)
         {
                 mLookAt->markDead() ;