diff --git a/include/boost/function/function_base.hpp b/include/boost/function/function_base.hpp
index 7c70c70..8067b64 100644
--- a/include/boost/function/function_base.hpp
+++ b/include/boost/function/function_base.hpp
@@ -401,9 +401,9 @@ namespace boost {
             out_buffer.members.type.const_qualified = false;
             out_buffer.members.type.volatile_qualified = false;
             return;
+          } else {
+            manager(in_buffer, out_buffer, op, tag_type());
           }
-          manager(in_buffer, out_buffer, op, tag_type());
-          return;
         }
       };
 
@@ -507,11 +507,11 @@ namespace boost {
                functor_manager_operation_type op)
         {
           typedef typename get_function_tag<functor_type>::type tag_type;
-          if(op == get_functor_type_tag){
+          if (op == get_functor_type_tag) {
             out_buffer.members.type.type = &boost::typeindex::type_id<functor_type>().type_info();
             out_buffer.members.type.const_qualified = false;
             out_buffer.members.type.volatile_qualified = false;
-          }else{
+          } else {
             manager(in_buffer, out_buffer, op, tag_type());
           }
         }