diff --git a/include/boost/shared_ptr.hpp b/include/boost/shared_ptr.hpp
index e2ddb94..0c00e9a 100644
--- a/include/boost/shared_ptr.hpp
+++ b/include/boost/shared_ptr.hpp
@@ -120,7 +120,7 @@ public:
     {
         if (px == 0) // need to allocate new counter -- the cast failed
         {
-            pn = detail::shared_count(static_cast<element_type *>(0), deleter());
+            pn = detail::shared_count();
         }
     }
 
diff --git a/shared_ptr.htm b/shared_ptr.htm
index ae1c36d..ff3e5aa 100644
--- a/shared_ptr.htm
+++ b/shared_ptr.htm
@@ -347,7 +347,7 @@ q = p;
 			<P><B>Returns:</B> A <STRONG>shared_ptr&lt;T&gt;</STRONG> object that stores a copy 
 				of <CODE><A href="../conversion/cast.htm#Polymorphic_cast">polymorphic_cast</A>&lt;T*&gt;(r.get())</CODE>
 				and shares ownership with <B>r</B>.</P>
-			<P><B>Throws:</B> <STRONG>std::bad_cast</STRONG>.</P>
+			<P><B>Throws:</B> <STRONG>std::bad_cast</STRONG> when the pointer cannot be converted.</P>
 			<P><B>Exception safety:</B> If an exception is thrown, the function has no effect.</P>
 		</BLOCKQUOTE>
 		<h3><a name="shared_polymorphic_downcast">shared_polymorphic_downcast</a></h3>