diff --git a/include/boost/thread/future.hpp b/include/boost/thread/future.hpp
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
@@ -293,7 +293,8 @@ rule thread-compile ( sources : reqs * : name )
           [ thread-run test_7328.cpp ]
           [ thread-run test_7571.cpp ]
           [ thread-run test_9319.cpp ]
-          #[ thread-run test_9711.cpp ] this test is invalid and should not work :(
+          #[ thread-run test_9711.cpp ] This is an invalid use of ::then deferred.
+          [ thread-run test_9856.cpp ]
           [ thread-compile test_10963.cpp : : test_10963_c ]
           [ thread-run test_10964.cpp ]
     ;
@@ -913,7 +914,6 @@ rule thread-compile ( sources : reqs * : name )
           [ thread-run test_9192.cpp ]
           #[ thread-run test_9303.cpp ]
           #[ thread-run test_9720.cpp ]
-          [ thread-run test_9856.cpp ]
           #[ thread-run test_10125.cpp ]
           #[ thread-run test_10128.cpp ]
           #[ thread-run test_10340.cpp ]

diff --git a/test/sync/futures/async/async_pass.cpp b/test/sync/futures/async/async_pass.cpp
@@ -167,6 +167,48 @@ struct check_timer {
 
 int main()
 {
+  {
+    try {
+      boost::async(f0);
+    } catch (std::exception& ex)
+    {
+      std::cout << __FILE__ << "[" << __LINE__ << "]" << ex.what() << std::endl;
+      BOOST_TEST(false && "exception thrown");
+    }
+    catch (...)
+    {
+      BOOST_TEST(false && "exception thrown");
+    }
+  }
+  {
+    try {
+      boost::async(boost::launch::async, f0);
+    } catch (std::exception& ex)
+    {
+      std::cout << __FILE__ << "[" << __LINE__ << "]" << ex.what() << std::endl;
+      BOOST_TEST(false && "exception thrown");
+    }
+    catch (...)
+    {
+      BOOST_TEST(false && "exception thrown");
+    }
+  }
+#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+  std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
+  {
+    try {
+      boost::async(boost::launch::deferred, f0);
+    } catch (std::exception& ex)
+    {
+      std::cout << __FILE__ << "[" << __LINE__ << "]" << ex.what() << std::endl;
+      BOOST_TEST(false && "exception thrown");
+    }
+    catch (...)
+    {
+      BOOST_TEST(false && "exception thrown");
+    }
+  }
+#endif
   std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
   {
     try

diff --git a/test/sync/futures/future/async_deferred_then_pass.cpp b/test/sync/futures/future/async_deferred_then_pass.cpp
@@ -51,6 +51,29 @@ void p3(boost::future<int> f)
 
 int main()
 {
+  BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
+  {
+    try
+    {
+      boost::future<int> f1 = boost::async(boost::launch::deferred, &p1);
+      BOOST_TEST(f1.valid());
+      {
+      boost::future<int> f2 = f1.then(&p2);
+      BOOST_TEST(f2.valid());
+      }
+      BOOST_TEST(! f1.valid());
+    }
+    catch (std::exception& ex)
+    {
+      BOOST_THREAD_LOG << "ERRORRRRR "<<ex.what() << "" << BOOST_THREAD_END_LOG;
+      BOOST_TEST(false);
+    }
+    catch (...)
+    {
+      BOOST_THREAD_LOG << " ERRORRRRR exception thrown" << BOOST_THREAD_END_LOG;
+      BOOST_TEST(false);
+    }
+  }
   BOOST_THREAD_LOG << BOOST_THREAD_END_LOG;
   {
     boost::future<int> f1 = boost::async(boost::launch::deferred, &p1);

diff --git a/test/test_9319.cpp b/test/test_9319.cpp
@@ -24,18 +24,37 @@ void foo(IntPromise p)
 
 void bar(boost::future<int> fooResult)
 {
+  try {
     std::cout << "bar" << std::endl;
     int i = fooResult.get(); // Code hangs on this line (Due to future already being locked by the set_value call)
     std::cout << "i: " << i << std::endl;
+  } catch(...) {
+    std::cout << __FILE__ << ":" << __LINE__ << std::endl;
+  }
 }
 
 int main()
 {
+  std::cout << __FILE__ << ":" << __LINE__ << std::endl;
+  try {
     IntPromise p(new boost::promise<int>());
     boost::thread t(boost::bind(foo, p));
     boost::future<int> f1 = p->get_future();
-    //f1.then(launch::deferred, boost::bind(bar, _1));
     f1.then(boost::launch::deferred, &bar);
     t.join();
+  } catch(...) {
+    return 1;
+  }
+  std::cout << __FILE__ << ":" << __LINE__ << std::endl;
+  try {
+    IntPromise p(new boost::promise<int>());
+    boost::thread t(boost::bind(foo, p));
+    boost::future<int> f1 = p->get_future();
+    f1.then(boost::launch::async, &bar);
+    t.join();
+  } catch(...) {
+    return 2;
+  }
+  std::cout << __FILE__ << ":" << __LINE__ << std::endl;
 }