@@ -992,15 +992,16 @@ PyArray_NewFromDescr(
         int nd, npy_intp const *dims, npy_intp const *strides, void *data,
         int flags, PyObject *obj)
 {
-    if (subtype == NULL) {
+    if (descr == NULL) {
         PyErr_SetString(PyExc_ValueError,
-            "subtype is NULL in PyArray_NewFromDescr");
+                        "descr is NULL in PyArray_NewFromDescr");
         return NULL;
     }
 
-    if (descr == NULL) {
+    if (subtype == NULL) {
         PyErr_SetString(PyExc_ValueError,
-            "descr is NULL in PyArray_NewFromDescr");
+            "subtype is NULL in PyArray_NewFromDescr");
+        Py_DECREF(descr);
         return NULL;
     }
Original file line number	Diff line number	Diff line change
`@@ -992,15 +992,16 @@ PyArray_NewFromDescr(`
`992`	`992`	`int nd, npy_intp const dims, npy_intp const strides, void *data,`
`993`	`993`	`int flags, PyObject *obj)`
`994`	`994`	`{`
`995`		`- if (subtype == NULL) {`
	`995`	`+ if (descr == NULL) {`
`996`	`996`	`PyErr_SetString(PyExc_ValueError,`
`997`		`- "subtype is NULL in PyArray_NewFromDescr");`
	`997`	`+ "descr is NULL in PyArray_NewFromDescr");`
`998`	`998`	`return NULL;`
`999`	`999`	`}`
`1000`	`1000`
`1001`		`- if (descr == NULL) {`
	`1001`	`+ if (subtype == NULL) {`
`1002`	`1002`	`PyErr_SetString(PyExc_ValueError,`
`1003`		`- "descr is NULL in PyArray_NewFromDescr");`
	`1003`	`+ "subtype is NULL in PyArray_NewFromDescr");`
	`1004`	`+ Py_DECREF(descr);`
`1004`	`1005`	`return NULL;`
`1005`	`1006`	`}`
`1006`	`1007`