diff --git a/include/boost/exception/detail/exception_ptr.hpp b/include/boost/exception/detail/exception_ptr.hpp
index 21b35e3..53648f8 100644
--- a/include/boost/exception/detail/exception_ptr.hpp
+++ b/include/boost/exception/detail/exception_ptr.hpp
@@ -20,6 +20,7 @@
 #include <boost/core/demangle.hpp>
 #endif
 #include <boost/shared_ptr.hpp>
+#include <boost/make_shared.hpp>
 #include <stdexcept>
 #include <new>
 #include <ios>
@@ -81,8 +82,9 @@ boost
     exception_ptr
     copy_exception( E const & e )
         {
-        wrapexcept<E> * w = new wrapexcept<E>(e);
-        return exception_ptr(shared_ptr<wrapexcept<E> >(w));
+        E cp = e;
+        exception_detail::copy_boost_exception(&cp, &e);
+        return exception_ptr(boost::make_shared<wrapexcept<E> >(cp));
         }
 
     template <class T>
diff --git a/test/copy_exception_test.cpp b/test/copy_exception_test.cpp
index 69acb65..649ade2 100644
--- a/test/copy_exception_test.cpp
+++ b/test/copy_exception_test.cpp
@@ -110,7 +110,7 @@ void
 thread_test()
     {
     boost::thread_group grp;
-    for( int i=0; i!=50; ++i )
+    for( int i=0; i!=100; ++i )
         grp.create_thread(&consume);
     grp.join_all ();
     }