diff --git a/README b/README
index a441bfedf..8d470c1c9 100644
--- a/README
+++ b/README
@@ -15,8 +15,8 @@ Singularity Viewer is a SecondLife(tm) protocol compatible client application.
 It can be used to access SecondLife services as well as a number of others such
 as those based upon the OpenSim platform.
 
-Singulariy is maintained by a small group of volunteers who can be contacted
-both, in-world (SingularityViewer group) as well on IRC (#SingularityViewer
+Singularity is maintained by a small group of volunteers who can be contacted
+both, in-world (SingularityViewer group) as well as on IRC (#SingularityViewer
 @ FreeNode). Bug requests and features requests can be submitted through our
 Issue Tracker (http://code.google.com/p/singularity-viewer/issues/list or from
 the viewer menu: Help --> Bug Reporting --> Singularity Issue Tracker...)
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 9f7ad95fd..ee2fff671 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2530,7 +2530,7 @@ void LLVOAvatar::idleUpdateMisc(bool detailed_update)
 													!(attached_object->mDrawable->getSpatialBridge() &&
 													  attached_object->mDrawable->getSpatialBridge()->getRadius() < 2.0));
 
-				if (visibleAttachment && attached_object && !attached_object->isDead() && attachment->getValid())
+				if (visibleAttachment && attached_object && attached_object->mDrawable && !attached_object->isDead() && attachment->getValid())
 				{
 					// if selecting any attachments, update all of them as non-damped
 					if (LLSelectMgr::getInstance()->getSelection()->getObjectCount() && LLSelectMgr::getInstance()->getSelection()->isAttachment())