From f4aa72373bb29c8de24c2f14c3dafe2bb2aac71d Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Thu, 26 Sep 2002 00:11:30 +0000
Subject: [PATCH] Serious bugfix

[SVN r15518]
---
 include/boost/python/converter/return_from_python.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/boost/python/converter/return_from_python.hpp b/include/boost/python/converter/return_from_python.hpp
index 58d182f0..c487aa22 100755
--- a/include/boost/python/converter/return_from_python.hpp
+++ b/include/boost/python/converter/return_from_python.hpp
@@ -13,6 +13,7 @@
 # include <boost/python/detail/void_ptr.hpp>
 # include <boost/call_traits.hpp>
 # include <boost/python/detail/void_return.hpp>
+# include <boost/python/errors.hpp>
 
 namespace boost { namespace python { namespace converter { 
 
@@ -141,7 +142,7 @@ namespace detail
   inline T return_object_manager_from_python<T>::operator()(PyObject* obj) const
   {
       return T(
-          object_manager_traits<T>::adopt(obj)
+          object_manager_traits<T>::adopt(expect_non_null(obj))
           );
   }
 }