diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index 8be04af15e1ef..6c60187f5725a 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -177,7 +177,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
             }
           else
             {
-              *os << ", 0";
+              *os << ", nullptr";
             }
 
           *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
index 7a4e5274a17b0..ed33cec4a6c21 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
@@ -63,7 +63,7 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node)
             }
           else
             {
-              *os << ", 0";
+              *os << ", nullptr";
             }
 
           *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
index 1bfee6eed039f..9a109a74ec19d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
@@ -352,10 +352,10 @@ be_visitor_operation_upcall_command_ss::gen_upcall (
         }
 
       os << be_nl
-         << "TAO::ExceptionHolder *tao_excepholder = " << be_idt_nl
+         << "TAO::ExceptionHolder *tao_excepholder = "
          << "dynamic_cast<TAO::ExceptionHolder *> (arg_" << index
-         << ");" << be_uidt_nl
-         << "if (tao_excepholder != 0)" << be_idt_nl
+         << ");" << be_nl
+         << "if (tao_excepholder)" << be_idt_nl
          << "{" << be_idt_nl
          << "tao_excepholder->set_exception_data "
             "(_tao_" << op_name << "_exceptiondata, " << exceptions_count << ");" << be_uidt_nl