Remap ENOMEM from PROJ_ERR_INVALID_OP to PROJ_ERR_OTHER

85 files changed, 150 insertions, 150 deletions

diff --git a/src/4D_api.cpp b/src/4D_api.cpp
index 556a8c2d..7423240f 100644
--- a/src/4D_api.cpp
+++ b/src/4D_api.cpp
@@ -787,7 +787,7 @@ PJ *pj_create_internal (PJ_CONTEXT *ctx, const char *definition) {
     n = strlen (definition);
     args = (char *) malloc (n + 1);
     if (nullptr==args) {
-        proj_context_errno_set(ctx, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        proj_context_errno_set(ctx, PROJ_ERR_OTHER /*ENOMEM*/);
         return nullptr;
     }
     strcpy (args, definition);
@@ -802,7 +802,7 @@ PJ *pj_create_internal (PJ_CONTEXT *ctx, const char *definition) {
     argv = pj_trim_argv (argc, args);
     if (!argv) {
         free(args);
-        proj_context_errno_set(ctx, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        proj_context_errno_set(ctx, PROJ_ERR_OTHER /*ENOMEM*/);
         return nullptr;
     }
 
@@ -872,7 +872,7 @@ Same as proj_create_argv() but calls pj_create_internal() instead of proj_create
     /* We assume that free format is used, and build a full proj_create compatible string */
     c = pj_make_args (argc, argv);
     if (nullptr==c) {
-        proj_context_errno_set(ctx, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        proj_context_errno_set(ctx, PROJ_ERR_OTHER /*ENOMEM*/);
         return nullptr;
     }
 
diff --git a/src/conversions/axisswap.cpp b/src/conversions/axisswap.cpp
index 33d0937c..682f74ef 100644
--- a/src/conversions/axisswap.cpp
+++ b/src/conversions/axisswap.cpp
@@ -174,7 +174,7 @@ PJ *CONVERSION(axisswap,0) {
     unsigned int i, j, n = 0;
 
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = (void *) Q;
 
 
diff --git a/src/conversions/set.cpp b/src/conversions/set.cpp
index 3db6db10..fa8c3eb7 100644
--- a/src/conversions/set.cpp
+++ b/src/conversions/set.cpp
@@ -42,7 +42,7 @@ PJ *OPERATION(set, 0) {
     auto set = static_cast<struct Set*>(calloc (1, sizeof(struct Set)));
     P->opaque = set;
     if (nullptr==P->opaque)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     if (pj_param_exists(P->params, "v_1"))
     {
diff --git a/src/conversions/topocentric.cpp b/src/conversions/topocentric.cpp
index 88119efa..bbe52400 100644
--- a/src/conversions/topocentric.cpp
+++ b/src/conversions/topocentric.cpp
@@ -78,7 +78,7 @@ PJ *CONVERSION(topocentric,1) {
 /*********************************************************************/
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = static_cast<void *>(Q);
 
     // The topocentric origin can be specified either in geocentric coordinates
@@ -120,7 +120,7 @@ PJ *CONVERSION(topocentric,1) {
     // Pass a dummy ellipsoid definition that will be overridden just afterwards
     PJ* cart = proj_create(P->ctx, "+proj=cart +a=1");
     if (cart == nullptr)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     /* inherit ellipsoid definition from P to cart */
     pj_inherit_ellipsoid_def (P, cart);
 
diff --git a/src/conversions/unitconvert.cpp b/src/conversions/unitconvert.cpp
index 58a60c37..187acf17 100644
--- a/src/conversions/unitconvert.cpp
+++ b/src/conversions/unitconvert.cpp
@@ -443,7 +443,7 @@ PJ *CONVERSION(unitconvert,0) {
     int z_out_is_linear = -1; /* unknown */
 
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = (void *) Q;
 
     P->fwd4d  = forward_4d;
diff --git a/src/datum_set.cpp b/src/datum_set.cpp
index e7853a53..d55eb982 100644
--- a/src/datum_set.cpp
+++ b/src/datum_set.cpp
@@ -87,7 +87,7 @@ int pj_datum_set(PJ_CONTEXT *ctx, paralist *pl, PJ *projdef)
             auto param = pj_mkparam(entry);
             if (nullptr == param)
             {
-                proj_context_errno_set(ctx, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+                proj_context_errno_set(ctx, PROJ_ERR_OTHER /*ENOMEM*/);
                 return 1;
             }
             curr->next = param;
@@ -99,7 +99,7 @@ int pj_datum_set(PJ_CONTEXT *ctx, paralist *pl, PJ *projdef)
             auto param = pj_mkparam(pj_datums[i].defn);
             if (nullptr == param)
             {
-                proj_context_errno_set(ctx, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+                proj_context_errno_set(ctx, PROJ_ERR_OTHER /*ENOMEM*/);
                 return 1;
             }
             curr->next = param;
diff --git a/src/ell_set.cpp b/src/ell_set.cpp
index a3e7d650..438448d2 100644
--- a/src/ell_set.cpp
+++ b/src/ell_set.cpp
@@ -163,12 +163,12 @@ static int ellps_ellps (PJ *P) {
 
     paralist* new_params = pj_mkparam (ellps->major);
     if (nullptr == new_params)
-        return proj_errno_set (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return proj_errno_set (P, PROJ_ERR_OTHER /*ENOMEM*/);
     new_params->next = pj_mkparam (ellps->ell);
     if (nullptr == new_params->next)
     {
         free(new_params);
-        return proj_errno_set (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return proj_errno_set (P, PROJ_ERR_OTHER /*ENOMEM*/);
     }
     paralist* old_params = P->params;
     P->params = new_params;
diff --git a/src/init.cpp b/src/init.cpp
index 461b44ba..a0d727cb 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -54,7 +54,7 @@ static paralist *string_to_paralist (PJ_CONTEXT *ctx, char *definition) {
         /* Keep a handle to the start of the list, so we have something to return */
         auto param = pj_mkparam_ws (c, &c);
         if (nullptr==param) {
-            free_params (ctx, first, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+            free_params (ctx, first, PROJ_ERR_OTHER /*ENOMEM*/);
             return nullptr;
         }
         if (nullptr==last) {
@@ -474,14 +474,14 @@ pj_init_ctx_with_allow_init_epsg(PJ_CONTEXT *ctx, int argc, char **argv, int all
     /* put arguments into internal linked list */
     start = curr = pj_mkparam(argv[0]);
     if (!curr) {
-        free_params (ctx, start, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        free_params (ctx, start, PROJ_ERR_OTHER /*ENOMEM*/);
         return nullptr;
     }
 
     for (i = 1; i < argc; ++i) {
         curr->next = pj_mkparam(argv[i]);
         if (!curr->next) {
-            free_params (ctx, start, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+            free_params (ctx, start, PROJ_ERR_OTHER /*ENOMEM*/);
             return nullptr;
         }
         curr = curr->next;
@@ -532,7 +532,7 @@ pj_init_ctx_with_allow_init_epsg(PJ_CONTEXT *ctx, int argc, char **argv, int all
     /* Allocate projection structure */
     PIN = proj(nullptr);
     if (nullptr==PIN) {
-        free_params (ctx, start, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        free_params (ctx, start, PROJ_ERR_OTHER /*ENOMEM*/);
         return nullptr;
     }
 
@@ -769,7 +769,7 @@ pj_init_ctx_with_allow_init_epsg(PJ_CONTEXT *ctx, int argc, char **argv, int all
     /* Private object for the geodesic functions */
     PIN->geod = static_cast<struct geod_geodesic*>(calloc (1, sizeof (struct geod_geodesic)));
     if (nullptr==PIN->geod)
-        return pj_default_destructor (PIN, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (PIN, PROJ_ERR_OTHER /*ENOMEM*/);
     geod_init(PIN->geod, PIN->a,  (1 - sqrt (1 - PIN->es)));
 
     /* Projection specific initialization */
diff --git a/src/pipeline.cpp b/src/pipeline.cpp
index 6a46ebd8..b1989824 100644
--- a/src/pipeline.cpp
+++ b/src/pipeline.cpp
@@ -462,7 +462,7 @@ PJ *OPERATION(pipeline,0) {
 
     pipeline->current_argv = current_argv = static_cast<char**>(calloc (argc, sizeof (char *)));
     if (nullptr==current_argv)
-        return destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     /* Do some syntactical sanity checking */
     for (i = 0;  i < argc;  i++) {
@@ -681,7 +681,7 @@ static PJ *setup_pushpop(PJ *P) {
     auto pushpop = static_cast<struct PushPop*>(calloc (1, sizeof(struct PushPop)));
     P->opaque = pushpop;
     if (nullptr==P->opaque)
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     if (pj_param_exists(P->params, "v_1"))
         pushpop->v1 = true;
diff --git a/src/projections/adams.cpp b/src/projections/adams.cpp
index 44e98a2c..389ca054 100644
--- a/src/projections/adams.cpp
+++ b/src/projections/adams.cpp
@@ -208,7 +208,7 @@ static PJ *setup(PJ *P, projection_type mode) {
             calloc (1, sizeof (struct pj_opaque)));
 
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     P->es = 0;
diff --git a/src/projections/aea.cpp b/src/projections/aea.cpp
index c5b03158..4cbbfb56 100644
--- a/src/projections/aea.cpp
+++ b/src/projections/aea.cpp
@@ -233,7 +233,7 @@ static PJ *setup(PJ *P) {
 PJ *PROJECTION(aea) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
@@ -246,7 +246,7 @@ PJ *PROJECTION(aea) {
 PJ *PROJECTION(leac) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
diff --git a/src/projections/aeqd.cpp b/src/projections/aeqd.cpp
index 2a42f379..e6443858 100644
--- a/src/projections/aeqd.cpp
+++ b/src/projections/aeqd.cpp
@@ -276,7 +276,7 @@ static PJ_LP aeqd_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse
 PJ *PROJECTION(aeqd) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
diff --git a/src/projections/airy.cpp b/src/projections/airy.cpp
index d162aba6..ead2c086 100644
--- a/src/projections/airy.cpp
+++ b/src/projections/airy.cpp
@@ -122,7 +122,7 @@ PJ *PROJECTION(airy) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     P->opaque = Q;
 
diff --git a/src/projections/aitoff.cpp b/src/projections/aitoff.cpp
index 1051c711..68f0c2da 100644
--- a/src/projections/aitoff.cpp
+++ b/src/projections/aitoff.cpp
@@ -189,7 +189,7 @@ static PJ *setup(PJ *P) {
 PJ *PROJECTION(aitoff) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->mode = AITOFF;
@@ -200,7 +200,7 @@ PJ *PROJECTION(aitoff) {
 PJ *PROJECTION(wintri) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->mode = WINKEL_TRIPEL;
diff --git a/src/projections/bacon.cpp b/src/projections/bacon.cpp
index c236e943..bc069a2c 100644
--- a/src/projections/bacon.cpp
+++ b/src/projections/bacon.cpp
@@ -45,7 +45,7 @@ static PJ_XY bacon_s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forwar
 PJ *PROJECTION(bacon) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
 	Q->bacn = 1;
@@ -59,7 +59,7 @@ PJ *PROJECTION(bacon) {
 PJ *PROJECTION(apian) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
 	Q->bacn = Q->ortl = 0;
@@ -72,7 +72,7 @@ PJ *PROJECTION(apian) {
 PJ *PROJECTION(ortel) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
 	Q->bacn = 0;
diff --git a/src/projections/bertin1953.cpp b/src/projections/bertin1953.cpp
index db7aa7c8..512384b4 100644
--- a/src/projections/bertin1953.cpp
+++ b/src/projections/bertin1953.cpp
@@ -77,7 +77,7 @@ static PJ_XY bertin1953_s_forward (PJ_LP lp, PJ *P) {
 PJ *PROJECTION(bertin1953) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     P->lam0 = 0;
diff --git a/src/projections/bipc.cpp b/src/projections/bipc.cpp
index e89e189a..0071b4b5 100644
--- a/src/projections/bipc.cpp
+++ b/src/projections/bipc.cpp
@@ -170,7 +170,7 @@ static PJ_LP bipc_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse
 PJ *PROJECTION(bipc) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->noskew = pj_param(P->ctx, P->params, "bns").i;
diff --git a/src/projections/bonne.cpp b/src/projections/bonne.cpp
index 1728a477..6923409b 100644
--- a/src/projections/bonne.cpp
+++ b/src/projections/bonne.cpp
@@ -115,7 +115,7 @@ PJ *PROJECTION(bonne) {
     double c;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
@@ -129,7 +129,7 @@ PJ *PROJECTION(bonne) {
     if (P->es != 0.0) {
         Q->en = pj_enfn(P->es);
         if (nullptr==Q->en)
-            return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+            return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
         Q->am1 = sin(Q->phi1);
         c = cos(Q->phi1);
         Q->m1 = pj_mlfn(Q->phi1, Q->am1, c, Q->en);
diff --git a/src/projections/cass.cpp b/src/projections/cass.cpp
index 9902f9d7..a7fb48be 100644
--- a/src/projections/cass.cpp
+++ b/src/projections/cass.cpp
@@ -113,12 +113,12 @@ PJ *PROJECTION(cass) {
     /* otherwise it's ellipsoidal */
     P->opaque = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==P->opaque)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->destructor = destructor;
 
     static_cast<struct pj_opaque*>(P->opaque)->en = pj_enfn (P->es);
     if (nullptr==static_cast<struct pj_opaque*>(P->opaque)->en)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     static_cast<struct pj_opaque*>(P->opaque)->m0 = pj_mlfn (P->phi0,  sin (P->phi0),  cos (P->phi0),  static_cast<struct pj_opaque*>(P->opaque)->en);
     P->inv = cass_e_inverse;
diff --git a/src/projections/ccon.cpp b/src/projections/ccon.cpp
index 5f58d536..dc0b0ea4 100644
--- a/src/projections/ccon.cpp
+++ b/src/projections/ccon.cpp
@@ -84,7 +84,7 @@ PJ *PROJECTION(ccon) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
@@ -95,7 +95,7 @@ PJ *PROJECTION(ccon) {
         return destructor(P, PROJ_ERR_INVALID_OP_ILLEGAL_ARG_VALUE);
     }
     if (!(Q->en = pj_enfn(P->es)))
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     Q->sinphi1 = sin(Q->phi1);
     Q->cosphi1 = cos(Q->phi1);
diff --git a/src/projections/cea.cpp b/src/projections/cea.cpp
index 0d850b49..e26a14f3 100644
--- a/src/projections/cea.cpp
+++ b/src/projections/cea.cpp
@@ -75,7 +75,7 @@ PJ *PROJECTION(cea) {
     double t = 0.0;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
@@ -95,7 +95,7 @@ PJ *PROJECTION(cea) {
         P->e = sqrt(P->es);
         Q->apa = pj_authset(P->es);
         if (!(Q->apa))
-            return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+            return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
         Q->qp = pj_qsfn(1., P->e, P->one_es);
         P->inv = cea_e_inverse;
diff --git a/src/projections/chamb.cpp b/src/projections/chamb.cpp
index ca5d6d82..1050dad3 100644
--- a/src/projections/chamb.cpp
+++ b/src/projections/chamb.cpp
@@ -105,7 +105,7 @@ PJ *PROJECTION(chamb) {
     char line[10];
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
 
diff --git a/src/projections/col_urban.cpp b/src/projections/col_urban.cpp
index 6d8157b6..ffeb1785 100644
--- a/src/projections/col_urban.cpp
+++ b/src/projections/col_urban.cpp
@@ -56,7 +56,7 @@ static PJ_LP col_urban_inverse (PJ_XY xy, PJ *P) {
 PJ *PROJECTION(col_urban) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     const double h0_unscaled = pj_param(P->ctx, P->params, "dh_0").f;
diff --git a/src/projections/eck3.cpp b/src/projections/eck3.cpp
index cd0ccdf9..ff1f4c5b 100644
--- a/src/projections/eck3.cpp
+++ b/src/projections/eck3.cpp
@@ -54,7 +54,7 @@ static PJ *setup(PJ *P) {
 PJ *PROJECTION(eck3) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->C_x = 0.42223820031577120149;
@@ -69,7 +69,7 @@ PJ *PROJECTION(eck3) {
 PJ *PROJECTION(kav7) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     /* Defined twice in original code - Using 0.866...,
@@ -87,7 +87,7 @@ PJ *PROJECTION(kav7) {
 PJ *PROJECTION(wag6) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->C_x = 0.94745;
@@ -102,7 +102,7 @@ PJ *PROJECTION(wag6) {
 PJ *PROJECTION(putp1) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->C_x = 1.89490;
diff --git a/src/projections/eqc.cpp b/src/projections/eqc.cpp
index fd385bb2..0e696879 100644
--- a/src/projections/eqc.cpp
+++ b/src/projections/eqc.cpp
@@ -41,7 +41,7 @@ static PJ_LP eqc_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse
 PJ *PROJECTION(eqc) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     if ((Q->rc = cos(pj_param(P->ctx, P->params, "rlat_ts").f)) <= 0.)
diff --git a/src/projections/eqdc.cpp b/src/projections/eqdc.cpp
index 4f49c136..4407ab62 100644
--- a/src/projections/eqdc.cpp
+++ b/src/projections/eqdc.cpp
@@ -79,7 +79,7 @@ PJ *PROJECTION(eqdc) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
@@ -104,7 +104,7 @@ PJ *PROJECTION(eqdc) {
     }
 
     if (!(Q->en = pj_enfn(P->es)))
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     sinphi = sin(Q->phi1);
     Q->n = sinphi;
diff --git a/src/projections/eqearth.cpp b/src/projections/eqearth.cpp
index 9600e039..2b9ee468 100644
--- a/src/projections/eqearth.cpp
+++ b/src/projections/eqearth.cpp
@@ -145,7 +145,7 @@ static PJ *destructor (PJ *P, int errlev) { /* Destructor */
 PJ *PROJECTION(eqearth) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
     P->fwd = eqearth_e_forward;
@@ -156,7 +156,7 @@ PJ *PROJECTION(eqearth) {
     if (P->es != 0.0) {
        Q->apa = pj_authset(P->es); /* For auth_lat(). */
        if (nullptr == Q->apa)
-          return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+          return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
        Q->qp = pj_qsfn(1.0, P->e, P->one_es); /* For auth_lat(). */
        Q->rqda = sqrt(0.5*Q->qp); /* Authalic radius divided by major axis */
     }
diff --git a/src/projections/fouc_s.cpp b/src/projections/fouc_s.cpp
index 5a560d97..ba6e917d 100644
--- a/src/projections/fouc_s.cpp
+++ b/src/projections/fouc_s.cpp
@@ -57,7 +57,7 @@ static PJ_LP fouc_s_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inver
 PJ *PROJECTION(fouc_s) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->n = pj_param(P->ctx, P->params, "dn").f;
diff --git a/src/projections/geos.cpp b/src/projections/geos.cpp
index 8d05dd24..528ac4a5 100644
--- a/src/projections/geos.cpp
+++ b/src/projections/geos.cpp
@@ -201,7 +201,7 @@ PJ *PROJECTION(geos) {
     char *sweep_axis;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->h = pj_param(P->ctx, P->params, "dh").f;
diff --git a/src/projections/gn_sinu.cpp b/src/projections/gn_sinu.cpp
index 5d3f9491..863613b6 100644
--- a/src/projections/gn_sinu.cpp
+++ b/src/projections/gn_sinu.cpp
@@ -123,12 +123,12 @@ static void setup(PJ *P) {
 PJ *PROJECTION(sinu) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
     if (!(Q->en = pj_enfn(P->es)))
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     if (P->es != 0.0) {
         P->inv = gn_sinu_e_inverse;
@@ -145,7 +145,7 @@ PJ *PROJECTION(sinu) {
 PJ *PROJECTION(eck6) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
@@ -160,7 +160,7 @@ PJ *PROJECTION(eck6) {
 PJ *PROJECTION(mbtfps) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
@@ -175,7 +175,7 @@ PJ *PROJECTION(mbtfps) {
 PJ *PROJECTION(gn_sinu) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
diff --git a/src/projections/gnom.cpp b/src/projections/gnom.cpp
index 0d53cfab..6257008d 100644
--- a/src/projections/gnom.cpp
+++ b/src/projections/gnom.cpp
@@ -126,7 +126,7 @@ static PJ_LP gnom_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse
 PJ *PROJECTION(gnom) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     if (fabs(fabs(P->phi0) - M_HALFPI) < EPS10) {
diff --git a/src/projections/goode.cpp b/src/projections/goode.cpp
index 1107d203..6729820b 100644
--- a/src/projections/goode.cpp
+++ b/src/projections/goode.cpp
@@ -64,7 +64,7 @@ static PJ *destructor (PJ *P, int errlev) {              /* Destructor */
 PJ *PROJECTION(goode) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
@@ -72,14 +72,14 @@ PJ *PROJECTION(goode) {
     Q->sinu = pj_sinu(nullptr);
     Q->moll = pj_moll(nullptr);
     if (Q->sinu == nullptr || Q->moll == nullptr)
-        return destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     Q->sinu->es = 0.;
     Q->sinu->ctx = P->ctx;
     Q->moll->ctx = P->ctx;
     Q->sinu = pj_sinu(Q->sinu);
     Q->moll = pj_moll(Q->moll);
     if (Q->sinu == nullptr || Q->moll == nullptr)
-        return destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     P->fwd = goode_s_forward;
     P->inv = goode_s_inverse;
diff --git a/src/projections/gstmerc.cpp b/src/projections/gstmerc.cpp
index 8957d05d..ea41a33a 100644
--- a/src/projections/gstmerc.cpp
+++ b/src/projections/gstmerc.cpp
@@ -56,7 +56,7 @@ static PJ_LP gstmerc_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inve
 PJ *PROJECTION(gstmerc) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->lamc = P->lam0;
diff --git a/src/projections/hammer.cpp b/src/projections/hammer.cpp
index 5a183082..b66b757b 100644
--- a/src/projections/hammer.cpp
+++ b/src/projections/hammer.cpp
@@ -59,7 +59,7 @@ static PJ_LP hammer_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inver
 PJ *PROJECTION(hammer) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     if (pj_param(P->ctx, P->params, "tW").i) {
diff --git a/src/projections/healpix.cpp b/src/projections/healpix.cpp
index b6863fad..0340f7dd 100644
--- a/src/projections/healpix.cpp
+++ b/src/projections/healpix.cpp
@@ -615,7 +615,7 @@ static PJ *destructor (PJ *P, int errlev) {                        /* Destructor
 PJ *PROJECTION(healpix) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
@@ -625,7 +625,7 @@ PJ *PROJECTION(healpix) {
     if (P->es != 0.0) {
         Q->apa = pj_authset(P->es);             /* For auth_lat(). */
         if (nullptr==Q->apa)
-            return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+            return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
         Q->qp = pj_qsfn(1.0, P->e, P->one_es);  /* For auth_lat(). */
         P->a = P->a*sqrt(0.5*Q->qp);            /* Set P->a to authalic radius. */
         pj_calc_ellipsoid_params (P, P->a, P->es);  /* Ensure we have a consistent parameter set */
@@ -643,7 +643,7 @@ PJ *PROJECTION(healpix) {
 PJ *PROJECTION(rhealpix) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
@@ -664,7 +664,7 @@ PJ *PROJECTION(rhealpix) {
     if (P->es != 0.0) {
         Q->apa = pj_authset(P->es); /* For auth_lat(). */
         if (nullptr==Q->apa)
-            return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+            return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
         Q->qp = pj_qsfn(1.0, P->e, P->one_es); /* For auth_lat(). */
         P->a = P->a*sqrt(0.5*Q->qp); /* Set P->a to authalic radius. */
         P->ra = 1.0/P->a;
diff --git a/src/projections/igh.cpp b/src/projections/igh.cpp
index 9e51addf..a6bac0c4 100644
--- a/src/projections/igh.cpp
+++ b/src/projections/igh.cpp
@@ -210,7 +210,7 @@ PJ *PROJECTION(igh) {
     PJ_LP lp = { 0, phi_boundary };
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
 
@@ -222,7 +222,7 @@ PJ *PROJECTION(igh) {
         !setup_zone(P, Q, 7, pj_sinu,   d20, 0,   d20) ||
         !setup_zone(P, Q, 8, pj_sinu,  d140, 0,  d140))
     {
-       return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+       return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     }
 
     /* mollweide zones */
@@ -243,7 +243,7 @@ PJ *PROJECTION(igh) {
         !setup_zone(P, Q,11, pj_moll,   d20, -Q->dy0,   d20) ||
         !setup_zone(P, Q,12, pj_moll,  d140, -Q->dy0,  d140))
     {
-       return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+       return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     }
 
     P->inv = igh_s_inverse;
diff --git a/src/projections/igh_o.cpp b/src/projections/igh_o.cpp
index 1a7485e1..c0931117 100644
--- a/src/projections/igh_o.cpp
+++ b/src/projections/igh_o.cpp
@@ -224,7 +224,7 @@ PJ *PROJECTION(igh_o) {
     PJ_LP lp = { 0, phi_boundary };
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
 
@@ -236,13 +236,13 @@ PJ *PROJECTION(igh_o) {
         !setup_zone(P, Q, 8, pj_sinu,   d20, 0,   d20) ||
         !setup_zone(P, Q, 9, pj_sinu,  d150, 0,  d150))
     {
-       return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+       return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     }
 
 
     /* mollweide zones */
     if (!setup_zone(P, Q, 1, pj_moll,  -d140, 0,  -d140)) {
-       return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+       return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     }
 
     /* y0 ? */
@@ -260,7 +260,7 @@ PJ *PROJECTION(igh_o) {
         !setup_zone(P, Q, 11, pj_moll,   d20, -Q->dy0,   d20)  ||
         !setup_zone(P, Q, 12, pj_moll,  d150, -Q->dy0,  d150))
     {
-       return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+       return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     }
 
     P->inv = igh_o_s_inverse;
diff --git a/src/projections/imw_p.cpp b/src/projections/imw_p.cpp
index 6f0bfe5f..ed5cb897 100644
--- a/src/projections/imw_p.cpp
+++ b/src/projections/imw_p.cpp
@@ -183,10 +183,10 @@ PJ *PROJECTION(imw_p) {
     int err;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
-    if (!(Q->en = pj_enfn(P->es))) return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+    if (!(Q->en = pj_enfn(P->es))) return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     if( (err = phi12(P, &del, &sig)) != 0) {
         return destructor(P, err);
     }
diff --git a/src/projections/isea.cpp b/src/projections/isea.cpp
index 7a782f3d..08e558a4 100644
--- a/src/projections/isea.cpp
+++ b/src/projections/isea.cpp
@@ -1041,7 +1041,7 @@ PJ *PROJECTION(isea) {
     char *opt;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
 
diff --git a/src/projections/krovak.cpp b/src/projections/krovak.cpp
index 2afe3672..1ddf7777 100644
--- a/src/projections/krovak.cpp
+++ b/src/projections/krovak.cpp
@@ -193,7 +193,7 @@ PJ *PROJECTION(krovak) {
     double u0, n0, g;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     /* we want Bessel as fixed ellipsoid */
diff --git a/src/projections/labrd.cpp b/src/projections/labrd.cpp
index b17e71e9..9fa17817 100644
--- a/src/projections/labrd.cpp
+++ b/src/projections/labrd.cpp
@@ -107,7 +107,7 @@ PJ *PROJECTION(labrd) {
     double Az, sinp, R, N, t;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     if (P->phi0 == 0.) {
diff --git a/src/projections/laea.cpp b/src/projections/laea.cpp
index 5054e8ff..8c7797e8 100644
--- a/src/projections/laea.cpp
+++ b/src/projections/laea.cpp
@@ -244,7 +244,7 @@ PJ *PROJECTION(laea) {
     double t;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
@@ -267,7 +267,7 @@ PJ *PROJECTION(laea) {
         Q->mmf = .5 / (1. - P->es);
         Q->apa = pj_authset(P->es);
         if (nullptr==Q->apa)
-            return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+            return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
         switch (Q->mode) {
         case N_POLE:
         case S_POLE:
diff --git a/src/projections/lagrng.cpp b/src/projections/lagrng.cpp
index fa680643..228f0b80 100644
--- a/src/projections/lagrng.cpp
+++ b/src/projections/lagrng.cpp
@@ -73,7 +73,7 @@ PJ *PROJECTION(lagrng) {
     double sin_phi1;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     if( pj_param(P->ctx, P->params, "tW").i )
diff --git a/src/projections/lcc.cpp b/src/projections/lcc.cpp
index 42d8b2c9..b47cf67e 100644
--- a/src/projections/lcc.cpp
+++ b/src/projections/lcc.cpp
@@ -83,7 +83,7 @@ PJ *PROJECTION(lcc) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc(1, sizeof (struct pj_opaque)));
 
     if (nullptr == Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->phi1 = pj_param(P->ctx, P->params, "rlat_1").f;
diff --git a/src/projections/lcca.cpp b/src/projections/lcca.cpp
index 6f962699..9de4d5dc 100644
--- a/src/projections/lcca.cpp
+++ b/src/projections/lcca.cpp
@@ -137,12 +137,12 @@ PJ *PROJECTION(lcca) {
     double s2p0, N0, R0, tan0;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     (Q->en = pj_enfn(P->es));
     if (!Q->en)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     if (P->phi0 == 0.) {
         proj_log_error(P, _("Invalid value for lat_0: it should be different from 0."));
diff --git a/src/projections/loxim.cpp b/src/projections/loxim.cpp
index e0b62f1b..00f43da4 100644
--- a/src/projections/loxim.cpp
+++ b/src/projections/loxim.cpp
@@ -58,7 +58,7 @@ static PJ_LP loxim_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, invers
 PJ *PROJECTION(loxim) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->phi1 = pj_param(P->ctx, P->params, "rlat_1").f;
diff --git a/src/projections/lsat.cpp b/src/projections/lsat.cpp
index ad056da5..a7f386f7 100644
--- a/src/projections/lsat.cpp
+++ b/src/projections/lsat.cpp
@@ -160,7 +160,7 @@ PJ *PROJECTION(lsat) {
     double lam, alf, esc, ess;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     land = pj_param(P->ctx, P->params, "ilsat").i;
diff --git a/src/projections/misrsom.cpp b/src/projections/misrsom.cpp
index 23376789..07c9961e 100644
--- a/src/projections/misrsom.cpp
+++ b/src/projections/misrsom.cpp
@@ -180,7 +180,7 @@ PJ *PROJECTION(misrsom) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     path = pj_param(P->ctx, P->params, "ipath").i;
diff --git a/src/projections/mod_ster.cpp b/src/projections/mod_ster.cpp
index 237ff75a..ae64c494 100644
--- a/src/projections/mod_ster.cpp
+++ b/src/projections/mod_ster.cpp
@@ -136,7 +136,7 @@ PJ *PROJECTION(mil_os) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->n = 2;
@@ -159,7 +159,7 @@ PJ *PROJECTION(lee_os) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->n = 2;
@@ -184,7 +184,7 @@ PJ *PROJECTION(gs48) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->n = 4;
@@ -219,7 +219,7 @@ PJ *PROJECTION(alsk) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->n = 5;
@@ -267,7 +267,7 @@ PJ *PROJECTION(gs50) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->n = 9;
diff --git a/src/projections/moll.cpp b/src/projections/moll.cpp
index 523de210..87b38336 100644
--- a/src/projections/moll.cpp
+++ b/src/projections/moll.cpp
@@ -79,7 +79,7 @@ static PJ * setup(PJ *P, double p) {
 PJ *PROJECTION(moll) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     return setup(P, M_HALFPI);
@@ -89,7 +89,7 @@ PJ *PROJECTION(moll) {
 PJ *PROJECTION(wag4) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     return setup(P, M_PI/3.);
@@ -98,7 +98,7 @@ PJ *PROJECTION(wag4) {
 PJ *PROJECTION(wag5) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     P->es = 0;
diff --git a/src/projections/nsper.cpp b/src/projections/nsper.cpp
index 5f76d9b0..9e67388e 100644
--- a/src/projections/nsper.cpp
+++ b/src/projections/nsper.cpp
@@ -185,7 +185,7 @@ static PJ *setup(PJ *P) {
 PJ *PROJECTION(nsper) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->tilt = 0;
@@ -199,7 +199,7 @@ PJ *PROJECTION(tpers) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     omega = pj_param(P->ctx, P->params, "rtilt").f;
diff --git a/src/projections/ob_tran.cpp b/src/projections/ob_tran.cpp
index abab5835..78c57521 100644
--- a/src/projections/ob_tran.cpp
+++ b/src/projections/ob_tran.cpp
@@ -180,7 +180,7 @@ PJ *PROJECTION(ob_tran) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     P->opaque = Q;
     P->destructor = destructor;
diff --git a/src/projections/ocea.cpp b/src/projections/ocea.cpp
index febebcc0..33f8d1f3 100644
--- a/src/projections/ocea.cpp
+++ b/src/projections/ocea.cpp
@@ -54,7 +54,7 @@ PJ *PROJECTION(ocea) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->rok = 1. / P->k0;
diff --git a/src/projections/oea.cpp b/src/projections/oea.cpp
index 2d16d529..2f13ae98 100644
--- a/src/projections/oea.cpp
+++ b/src/projections/oea.cpp
@@ -60,7 +60,7 @@ static PJ_LP oea_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse
 PJ *PROJECTION(oea) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     if (((Q->n = pj_param(P->ctx, P->params, "dn").f) <= 0.) )
diff --git a/src/projections/omerc.cpp b/src/projections/omerc.cpp
index 88d63809..48943972 100644
--- a/src/projections/omerc.cpp
+++ b/src/projections/omerc.cpp
@@ -128,7 +128,7 @@ PJ *PROJECTION(omerc) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->no_rot = pj_param(P->ctx, P->params, "bno_rot").i;
diff --git a/src/projections/ortho.cpp b/src/projections/ortho.cpp
index 206abb69..9e0d9bba 100644
--- a/src/projections/ortho.cpp
+++ b/src/projections/ortho.cpp
@@ -281,7 +281,7 @@ static PJ_LP ortho_e_inverse (PJ_XY xy, PJ *P) {           /* Ellipsoidal, inver
 PJ *PROJECTION(ortho) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->sinph0 = sin(P->phi0);
diff --git a/src/projections/poly.cpp b/src/projections/poly.cpp
index 99b6772e..7b0b7717 100644
--- a/src/projections/poly.cpp
+++ b/src/projections/poly.cpp
@@ -156,14 +156,14 @@ static PJ *destructor(PJ *P, int errlev) {
 PJ *PROJECTION(poly) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     P->opaque = Q;
     P->destructor = destructor;
 
     if (P->es != 0.0) {
         if (!(Q->en = pj_enfn(P->es)))
-            return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+            return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
         Q->ml0 = pj_mlfn(P->phi0, sin(P->phi0), cos(P->phi0), Q->en);
         P->inv = poly_e_inverse;
         P->fwd = poly_e_forward;
diff --git a/src/projections/putp3.cpp b/src/projections/putp3.cpp
index 3554909e..3d72fdce 100644
--- a/src/projections/putp3.cpp
+++ b/src/projections/putp3.cpp
@@ -40,7 +40,7 @@ static PJ_LP putp3_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, invers
 PJ *PROJECTION(putp3) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->A = 4. * RPISQ;
@@ -55,7 +55,7 @@ PJ *PROJECTION(putp3) {
 PJ *PROJECTION(putp3p) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->A = 2. * RPISQ;
diff --git a/src/projections/putp4p.cpp b/src/projections/putp4p.cpp
index 1c9a763e..d17dbfda 100644
--- a/src/projections/putp4p.cpp
+++ b/src/projections/putp4p.cpp
@@ -47,7 +47,7 @@ static PJ_LP putp4p_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inver
 PJ *PROJECTION(putp4p) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->C_x = 0.874038744;
@@ -64,7 +64,7 @@ PJ *PROJECTION(putp4p) {
 PJ *PROJECTION(weren) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->C_x = 1.;
diff --git a/src/projections/putp5.cpp b/src/projections/putp5.cpp
index a6aed94e..d2e55625 100644
--- a/src/projections/putp5.cpp
+++ b/src/projections/putp5.cpp
@@ -45,7 +45,7 @@ static PJ_LP putp5_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, invers
 PJ *PROJECTION(putp5) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->A = 2.;
@@ -62,7 +62,7 @@ PJ *PROJECTION(putp5) {
 PJ *PROJECTION(putp5p) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->A = 1.5;
diff --git a/src/projections/putp6.cpp b/src/projections/putp6.cpp
index 63253fbd..a5d51020 100644
--- a/src/projections/putp6.cpp
+++ b/src/projections/putp6.cpp
@@ -61,7 +61,7 @@ static PJ_LP putp6_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, invers
 PJ *PROJECTION(putp6) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->C_x = 1.01346;
@@ -81,7 +81,7 @@ PJ *PROJECTION(putp6) {
 PJ *PROJECTION(putp6p) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->C_x = 0.44329;
diff --git a/src/projections/qsc.cpp b/src/projections/qsc.cpp
index 920e93b0..ea35eb8c 100644
--- a/src/projections/qsc.cpp
+++ b/src/projections/qsc.cpp
@@ -379,7 +379,7 @@ static PJ_LP qsc_e_inverse (PJ_XY xy, PJ *P) {          /* Ellipsoidal, inverse
 PJ *PROJECTION(qsc) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     P->inv = qsc_e_inverse;
diff --git a/src/projections/rouss.cpp b/src/projections/rouss.cpp
index 195b90b3..7b513fdb 100644
--- a/src/projections/rouss.cpp
+++ b/src/projections/rouss.cpp
@@ -95,7 +95,7 @@ static PJ *destructor (PJ *P, int errlev) {
     if (static_cast<struct pj_opaque*>(P->opaque)->en)
         free (static_cast<struct pj_opaque*>(P->opaque)->en);
 
-    return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+    return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
 }
 
 
@@ -104,11 +104,11 @@ PJ *PROJECTION(rouss) {
 
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     if (!((Q->en = proj_mdist_ini(P->es))))
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     es2 = sin(P->phi0);
     Q->s0 = proj_mdist(P->phi0, es2, cos(P->phi0), Q->en);
diff --git a/src/projections/rpoly.cpp b/src/projections/rpoly.cpp
index 0c55954d..f2e45f5e 100644
--- a/src/projections/rpoly.cpp
+++ b/src/projections/rpoly.cpp
@@ -46,7 +46,7 @@ static PJ_XY rpoly_s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forwar
 PJ *PROJECTION(rpoly) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->phi1 = fabs(pj_param(P->ctx, P->params, "rlat_ts").f);
diff --git a/src/projections/sch.cpp b/src/projections/sch.cpp
index d10ccf6c..6e7641ff 100644
--- a/src/projections/sch.cpp
+++ b/src/projections/sch.cpp
@@ -131,7 +131,7 @@ static PJ *setup(PJ *P) { /* general initialization */
     // Pass a dummy ellipsoid definition that will be overridden just afterwards
     Q->cart = proj_create(P->ctx, "+proj=cart +a=1");
     if (Q->cart == nullptr)
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     /* inherit ellipsoid definition from P to Q->cart */
     pj_inherit_ellipsoid_def (P, Q->cart);
@@ -154,7 +154,7 @@ static PJ *setup(PJ *P) { /* general initialization */
     /* Set up local sphere at the given peg point */
     Q->cart_sph = proj_create(P->ctx, "+proj=cart +a=1");
     if (Q->cart_sph == nullptr)
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     pj_calc_ellipsoid_params(Q->cart_sph, Q->rcurv, 0);
 
     /* Set up the transformation matrices */
@@ -186,7 +186,7 @@ static PJ *setup(PJ *P) { /* general initialization */
 PJ *PROJECTION(sch) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     P->destructor = destructor;
 
diff --git a/src/projections/sconics.cpp b/src/projections/sconics.cpp
index 9084404c..8e977028 100644
--- a/src/projections/sconics.cpp
+++ b/src/projections/sconics.cpp
@@ -132,7 +132,7 @@ static PJ *setup(PJ *P, enum Type type) {
     int err;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     Q->type = type;
 
diff --git a/src/projections/somerc.cpp b/src/projections/somerc.cpp
index af8c0b17..6d6885e8 100644
--- a/src/projections/somerc.cpp
+++ b/src/projections/somerc.cpp
@@ -73,7 +73,7 @@ PJ *PROJECTION(somerc) {
     double cp, phip0, sp;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
 
diff --git a/src/projections/stere.cpp b/src/projections/stere.cpp
index 4646db3d..31b0fead 100644
--- a/src/projections/stere.cpp
+++ b/src/projections/stere.cpp
@@ -304,7 +304,7 @@ static PJ *setup(PJ *P) {                   /* general initialization */
 PJ *PROJECTION(stere) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->phits = pj_param (P->ctx, P->params, "tlat_ts").i ?
@@ -317,7 +317,7 @@ PJ *PROJECTION(stere) {
 PJ *PROJECTION(ups) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     /* International Ellipsoid */
diff --git a/src/projections/sterea.cpp b/src/projections/sterea.cpp
index 28fdea2e..19f2b778 100644
--- a/src/projections/sterea.cpp
+++ b/src/projections/sterea.cpp
@@ -103,12 +103,12 @@ PJ *PROJECTION(sterea) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
 
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->en = pj_gauss_ini(P->e, P->phi0, &(Q->phic0), &R);
     if (nullptr==Q->en)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     Q->sinc0 = sin (Q->phic0);
     Q->cosc0 = cos (Q->phic0);
diff --git a/src/projections/sts.cpp b/src/projections/sts.cpp
index cdd59044..1042e38b 100644
--- a/src/projections/sts.cpp
+++ b/src/projections/sts.cpp
@@ -72,7 +72,7 @@ static PJ *setup(PJ *P, double p, double q, int mode) {
 PJ *PROJECTION(fouc) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     return setup(P, 2., 2., 1);
 }
@@ -82,7 +82,7 @@ PJ *PROJECTION(fouc) {
 PJ *PROJECTION(kav5) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     return setup(P, 1.50488, 1.35439, 0);
@@ -93,7 +93,7 @@ PJ *PROJECTION(kav5) {
 PJ *PROJECTION(qua_aut) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     return setup(P, 2., 2., 0);
 }
@@ -103,7 +103,7 @@ PJ *PROJECTION(qua_aut) {
 PJ *PROJECTION(mbt_s) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
     return setup(P, 1.48875, 1.36509, 0);
 }
diff --git a/src/projections/tmerc.cpp b/src/projections/tmerc.cpp
index 7b98ea02..68411829 100644
--- a/src/projections/tmerc.cpp
+++ b/src/projections/tmerc.cpp
@@ -224,7 +224,7 @@ static PJ *setup_approx(PJ *P) {
 
     if (P->es != 0.0) {
         if (!(Q->en = pj_enfn(P->es)))
-            return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+            return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
         Q->ml0 = pj_mlfn(P->phi0, sin(P->phi0), cos(P->phi0), Q->en);
         Q->esp = P->es / (1. - P->es);
@@ -591,7 +591,7 @@ static PJ *setup(PJ *P, TMercAlgo eAlg) {
 
     struct tmerc_data *Q = static_cast<struct tmerc_data*>(calloc (1, sizeof (struct tmerc_data)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     if( P->es == 0 )
diff --git a/src/projections/tpeqd.cpp b/src/projections/tpeqd.cpp
index d6d8e790..5d3c7144 100644
--- a/src/projections/tpeqd.cpp
+++ b/src/projections/tpeqd.cpp
@@ -66,7 +66,7 @@ PJ *PROJECTION(tpeqd) {
     double lam_1, lam_2, phi_1, phi_2, A12;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
 
diff --git a/src/projections/urm5.cpp b/src/projections/urm5.cpp
index 25db4391..965c9458 100644
--- a/src/projections/urm5.cpp
+++ b/src/projections/urm5.cpp
@@ -32,7 +32,7 @@ PJ *PROJECTION(urm5) {
     double alpha, t;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     if (!pj_param(P->ctx, P->params, "tn").i )
diff --git a/src/projections/urmfps.cpp b/src/projections/urmfps.cpp
index 36c2b7d1..6df9ba57 100644
--- a/src/projections/urmfps.cpp
+++ b/src/projections/urmfps.cpp
@@ -49,7 +49,7 @@ static PJ *setup(PJ *P) {
 PJ *PROJECTION(urmfps) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     P->opaque = Q;
 
@@ -73,7 +73,7 @@ PJ *PROJECTION(urmfps) {
 PJ *PROJECTION(wag1) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     static_cast<struct pj_opaque*>(P->opaque)->n = 0.8660254037844386467637231707;
diff --git a/src/projections/vandg2.cpp b/src/projections/vandg2.cpp
index d3067952..b25c677a 100644
--- a/src/projections/vandg2.cpp
+++ b/src/projections/vandg2.cpp
@@ -55,7 +55,7 @@ static PJ_XY vandg2_s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forwa
 PJ *PROJECTION(vandg2) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->vdg3 = 0;
@@ -67,7 +67,7 @@ PJ *PROJECTION(vandg2) {
 PJ *PROJECTION(vandg3) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     Q->vdg3 = 1;
diff --git a/src/projections/wag3.cpp b/src/projections/wag3.cpp
index c7308c51..4d61d803 100644
--- a/src/projections/wag3.cpp
+++ b/src/projections/wag3.cpp
@@ -37,7 +37,7 @@ PJ *PROJECTION(wag3) {
 	double ts;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     P->opaque = Q;
 
diff --git a/src/projections/wink1.cpp b/src/projections/wink1.cpp
index 0e68c1ab..0fbd6a77 100644
--- a/src/projections/wink1.cpp
+++ b/src/projections/wink1.cpp
@@ -35,7 +35,7 @@ static PJ_LP wink1_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, invers
 PJ *PROJECTION(wink1) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
 	static_cast<struct pj_opaque*>(P->opaque)->cosphi1 = cos (pj_param(P->ctx, P->params, "rlat_ts").f);
diff --git a/src/projections/wink2.cpp b/src/projections/wink2.cpp
index d3ba49d5..bd46930f 100644
--- a/src/projections/wink2.cpp
+++ b/src/projections/wink2.cpp
@@ -55,7 +55,7 @@ static PJ_LP wink2_s_inverse(PJ_XY xy, PJ *P)
 PJ *PROJECTION(wink2) {
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     static_cast<struct pj_opaque*>(P->opaque)->cosphi1 = cos(pj_param(P->ctx, P->params, "rlat_1").f);
diff --git a/src/transformations/affine.cpp b/src/transformations/affine.cpp
index 39fbb615..e6a94f1e 100644
--- a/src/transformations/affine.cpp
+++ b/src/transformations/affine.cpp
@@ -176,7 +176,7 @@ static void computeReverseParameters(PJ* P)
 PJ *TRANSFORMATION(affine,0 /* no need for ellipsoid */) {
     struct pj_opaque_affine *Q = initQ();
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = (void *) Q;
 
     P->fwd4d = forward_4d;
@@ -227,7 +227,7 @@ PJ *TRANSFORMATION(affine,0 /* no need for ellipsoid */) {
 PJ *TRANSFORMATION(geogoffset,0 /* no need for ellipsoid */) {
     struct pj_opaque_affine *Q = initQ();
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = (void *) Q;
 
     P->fwd4d = forward_4d;
diff --git a/src/transformations/defmodel.cpp b/src/transformations/defmodel.cpp
index 2ae8aec8..0d9f6690 100644
--- a/src/transformations/defmodel.cpp
+++ b/src/transformations/defmodel.cpp
@@ -384,7 +384,7 @@ PJ *TRANSFORMATION(defmodel, 1) {
     // Pass a dummy ellipsoid definition that will be overridden just afterwards
     auto cart = proj_create(P->ctx, "+proj=cart +a=1");
     if (cart == nullptr)
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     /* inherit ellipsoid definition from P to Q->cart */
     pj_inherit_ellipsoid_def(P, cart);
diff --git a/src/transformations/deformation.cpp b/src/transformations/deformation.cpp
index 56909eb2..1a04d0f5 100644
--- a/src/transformations/deformation.cpp
+++ b/src/transformations/deformation.cpp
@@ -358,7 +358,7 @@ PJ *TRANSFORMATION(deformation,1) {
     // Pass a dummy ellipsoid definition that will be overridden just afterwards
     Q->cart = proj_create(P->ctx, "+proj=cart +a=1");
     if (Q->cart == nullptr)
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     /* inherit ellipsoid definition from P to Q->cart */
     pj_inherit_ellipsoid_def (P, Q->cart);
diff --git a/src/transformations/helmert.cpp b/src/transformations/helmert.cpp
index edb85355..f9bb45e0 100644
--- a/src/transformations/helmert.cpp
+++ b/src/transformations/helmert.cpp
@@ -478,7 +478,7 @@ static PJ_COORD helmert_reverse_4d (PJ_COORD point, PJ *P) {
 static PJ* init_helmert_six_parameters(PJ* P) {
     struct pj_opaque_helmert *Q = static_cast<struct pj_opaque_helmert*>(calloc (1, sizeof (struct pj_opaque_helmert)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = (void *) Q;
 
     /* In most cases, we work on 3D cartesian coordinates */
diff --git a/src/transformations/horner.cpp b/src/transformations/horner.cpp
index f9403d2b..7c8ad192 100644
--- a/src/transformations/horner.cpp
+++ b/src/transformations/horner.cpp
@@ -471,7 +471,7 @@ PJ *PROJECTION(horner) {
 
     Q = horner_alloc (degree, complex_polynomia);
     if (Q == nullptr)
-        return horner_freeup (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return horner_freeup (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     if (complex_polynomia) {
diff --git a/src/transformations/molodensky.cpp b/src/transformations/molodensky.cpp
index 2d173ac6..70cf987b 100644
--- a/src/transformations/molodensky.cpp
+++ b/src/transformations/molodensky.cpp
@@ -299,7 +299,7 @@ static PJ_COORD reverse_4d(PJ_COORD obs, PJ *P) {
 PJ *TRANSFORMATION(molodensky,1) {
     struct pj_opaque_molodensky *Q = static_cast<struct pj_opaque_molodensky*>(calloc(1, sizeof(struct pj_opaque_molodensky)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = (void *) Q;
 
     P->fwd4d = forward_4d;
diff --git a/src/transformations/xyzgridshift.cpp b/src/transformations/xyzgridshift.cpp
index e11a4863..c75944ba 100644
--- a/src/transformations/xyzgridshift.cpp
+++ b/src/transformations/xyzgridshift.cpp
@@ -257,7 +257,7 @@ PJ *TRANSFORMATION(xyzgridshift,0) {
     // Pass a dummy ellipsoid definition that will be overridden just afterwards
     Q->cart = proj_create(P->ctx, "+proj=cart +a=1");
     if (Q->cart == nullptr)
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     /* inherit ellipsoid definition from P to Q->cart */
     pj_inherit_ellipsoid_def (P, Q->cart);