mnipy, (char*)"API");
+   api = (omniORBpyAPI*)PyCapsule_GetPointer(pyapi,"_omnipy.API");
+@@ -706,7 +710,11 @@ CORBAPTR(PortableServer::POA)
+       PyErr_SetObject(excc, exci);
+       Py_XDECREF(excc);
+       Py_XDECREF(exci);
++#if (SWIG_VERSION < 0x040400)
+       return NULL;
++#else
++      return 0;
++#endif
+    }
+    catch(Engines::DSC::PortNotConnected& _e) {
+       Py_BLOCK_THREADS
+@@ -715,7 +723,11 @@ CORBAPTR(PortableServer::POA)
+       PyErr_SetObject(excc, exci);
+       Py_XDECREF(excc);
+       Py_XDECREF(exci);
++#if (SWIG_VERSION < 0x040400)
+       return NULL;
++#else
++      return 0;
++#endif
+    }
+    catch(Engines::DSC::BadPortType& _e) {
+       Py_BLOCK_THREADS
+@@ -724,18 +736,30 @@ CORBAPTR(PortableServer::POA)
+       PyErr_SetObject(excc, exci);
+       Py_XDECREF(excc);
+       Py_XDECREF(exci);
++#if (SWIG_VERSION < 0x040400)
+       return NULL;
++#else
++      return 0;
++#endif
+    }
+    catch (SALOME_Exception &e) {
+       Py_BLOCK_THREADS
+       PyErr_SetString(PyExc_RuntimeError,e.what());
++#if (SWIG_VERSION < 0x040400)
+       return NULL;
++#else
++      return 0;
++#endif
+    }
+    catch (SALOME::SALOME_Exception &e) {
+       Py_BLOCK_THREADS
+       //This one should be converted into a python corba exception
+       PyErr_SetString(PyExc_RuntimeError,e.details.text);
++#if (SWIG_VERSION < 0x040400)
+       return NULL;
++#else
++      return 0;
++#endif
+    }
+    catch (const CORBA::SystemException& e) {
+       Py_BLOCK_THREADS 
+@@ -744,7 +768,11 @@ CORBAPTR(PortableServer::POA)
+    catch(...) {
+       Py_BLOCK_THREADS
+       PyErr_SetString(PyExc_ValueError,"Unknown exception");
++#if (SWIG_VERSION < 0x040400)
+       return NULL;
++#else
++      return 0;
++#endif
+    }
+    Py_END_ALLOW_THREADS
+ }
+--- src/Launcher_SWIG/Launcher.i.orig	2023-06-19 16:51:55 UTC
++++ src/Launcher_SWIG/Launcher.i
+@@ -139,7 +139,7 @@ struct ResourceDefinition_cpp (public)
+ {
+   try
+   {
+-    $function
++    $action
+   }
+   catch (ResourcesException& e)
+   {
+@@ -193,7 +193,7 @@ class ResourcesManager_cpp (public)
+ {
+   try
+   {
+-    $function
++    $action
+   }
+   catch (LauncherException& e)
+   {
+--- src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i.orig	2023-06-19 16:51:55 UTC
++++ src/LifeCycleCORBA_SWIG/libSALOME_LifeCycleCORBA.i
+@@ -63,7 +63,11 @@ omniORBpyAPI* api=0;
+   if (!omnipy)
+   {
+     PyErr_SetString(PyExc_ImportError, (char*)"Cannot import _omnipy");
++#if (SWIG_VERSION < 0x040400)
+     return NULL;
++#else
++    return 0;
++#endif
+   }
+   PyObject* pyapi = PyObject_GetAttrString(omnipy, (char*)"API");
+   api = (omniORBpyAPI*)PyCapsule_GetPointer(pyapi,"_omnipy.API");
+@@ -176,7 +180,11 @@ omniORBpyAPI* api=0;
+     {
+        MESSAGE("Not a ContainerParameters struct");
+        PyErr_SetString(PyExc_TypeError,"Must Be a Python ContainerParameters object");
+-       return NULL;
++#if (SWIG_VERSION < 0x040400)
++    return NULL;
++#else
++    return 0;
++#endif
+     }
+ }
+ 
+@@ -199,22 +207,38 @@ omniORBpyAPI* api=0;
+     catch (ServiceUnreachable&) {
+        Py_BLOCK_THREADS
+        PyErr_SetString(PyExc_RuntimeError,"Naming Service Unreacheable");
++#if (SWIG_VERSION < 0x040400)
+        return NULL;
++#else
++       return 0;
++#endif
+     }
+     catch (SALOME_Exception &e) {
+        Py_BLOCK_THREADS
+        PyErr_SetString(PyExc_RuntimeError,e.what());
++#if (SWIG_VERSION < 0x040400)
+        return NULL;
++#else
++       return 0;
++#endif
+     }
+     catch (SALOME::SALOME_Exception &e) {
+        Py_BLOCK_THREADS
+        PyErr_SetString(PyExc_RuntimeError,e.details.text);
++#if (SWIG_VERSION < 0x040400)
+        return NULL;
++#else
++       return 0;
++#endif
+     }
+     catch (...) {
+        Py_BLOCK_THREADS
+        PyErr_SetString(PyExc_RuntimeError, "unknown exception");
++#if (SWIG_VERSION < 0x040400)
+        return NULL;
++#else
++       return 0;
++#endif
+     }
+     Py_END_ALLOW_THREADS
+ }