diff --git a/Modules/LDAPObject.c b/Modules/LDAPObject.c
index 9f67273..0f52d22 100644
--- a/Modules/LDAPObject.c
+++ b/Modules/LDAPObject.c
@@ -415,7 +415,7 @@ l_ldap_unbind_ext(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_unbind_ext");
+        return LDAPerror(self->ldap);
 
     self->valid = 0;
     Py_INCREF(Py_None);
@@ -461,7 +461,7 @@ l_ldap_abandon_ext(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_abandon_ext");
+        return LDAPerror(self->ldap);
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -517,7 +517,7 @@ l_ldap_add_ext(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_add_ext");
+        return LDAPerror(self->ldap);
 
     return PyInt_FromLong(msgid);
 }
@@ -568,7 +568,7 @@ l_ldap_simple_bind(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_simple_bind");
+        return LDAPerror(self->ldap);
 
     return PyInt_FromLong(msgid);
 }
@@ -727,7 +727,7 @@ l_ldap_sasl_bind_s(LDAPObject *self, PyObject *args)
                                              servercred->bv_len);
     }
     else if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "l_ldap_sasl_bind_s");
+        return LDAPerror(self->ldap);
     return PyInt_FromLong(ldaperror);
 }
 
@@ -806,7 +806,7 @@ l_ldap_sasl_interactive_bind_s(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (msgid != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_sasl_interactive_bind_s");
+        return LDAPerror(self->ldap);
     return PyInt_FromLong(msgid);
 }
 #endif
@@ -854,7 +854,7 @@ l_ldap_cancel(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_cancel");
+        return LDAPerror(self->ldap);
 
     return PyInt_FromLong(msgid);
 }
@@ -908,7 +908,7 @@ l_ldap_compare_ext(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_compare_ext");
+        return LDAPerror(self->ldap);
 
     return PyInt_FromLong(msgid);
 }
@@ -954,7 +954,7 @@ l_ldap_delete_ext(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_delete_ext");
+        return LDAPerror(self->ldap);
 
     return PyInt_FromLong(msgid);
 }
@@ -1011,7 +1011,7 @@ l_ldap_modify_ext(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_modify_ext");
+        return LDAPerror(self->ldap);
 
     return PyInt_FromLong(msgid);
 }
@@ -1061,7 +1061,7 @@ l_ldap_rename(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_rename");
+        return LDAPerror(self->ldap);
 
     return PyInt_FromLong(msgid);
 }
@@ -1108,7 +1108,7 @@ l_ldap_result4(LDAPObject *self, PyObject *args)
     LDAP_END_ALLOW_THREADS(self);
 
     if (res_type < 0)   /* LDAP or system error */
-        return LDAPerror(self->ldap, "ldap_result4");
+        return LDAPerror(self->ldap);
 
     if (res_type == 0) {
         /* Polls return (None, None, None, None); timeouts raise an exception */
@@ -1164,7 +1164,7 @@ l_ldap_result4(LDAPObject *self, PyObject *args)
     if (result != LDAP_SUCCESS) {       /* result error */
         ldap_controls_free(serverctrls);
         Py_XDECREF(valuestr);
-        return LDAPraise_for_message(self->ldap, "ldap_parse_result", msg);
+        return LDAPraise_for_message(self->ldap, msg);
     }
 
     if (!(pyctrls = LDAPControls_to_List(serverctrls))) {
@@ -1176,7 +1176,7 @@ l_ldap_result4(LDAPObject *self, PyObject *args)
         ldap_controls_free(serverctrls);
         ldap_msgfree(msg);
         Py_XDECREF(valuestr);
-        return LDAPerror(self->ldap, "LDAPControls_to_List");
+        return LDAPerror(self->ldap);
     }
     ldap_controls_free(serverctrls);
 
@@ -1277,7 +1277,7 @@ l_ldap_search_ext(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_search_ext");
+        return LDAPerror(self->ldap);
 
     return PyInt_FromLong(msgid);
 }
@@ -1324,7 +1324,7 @@ l_ldap_whoami_s(LDAPObject *self, PyObject *args)
 
     if (ldaperror != LDAP_SUCCESS) {
         ber_bvfree(bvalue);
-        return LDAPerror(self->ldap, "ldap_whoami_s");
+        return LDAPerror(self->ldap);
     }
 
     result = LDAPberval_to_unicode_object(bvalue);
@@ -1351,7 +1351,7 @@ l_ldap_start_tls_s(LDAPObject *self, PyObject *args)
     LDAP_END_ALLOW_THREADS(self);
     if (ldaperror != LDAP_SUCCESS) {
         ldap_set_option(self->ldap, LDAP_OPT_ERROR_NUMBER, &ldaperror);
-        return LDAPerror(self->ldap, "ldap_start_tls_s");
+        return LDAPerror(self->ldap);
     }
 
     Py_INCREF(Py_None);
@@ -1443,7 +1443,7 @@ l_ldap_passwd(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_passwd");
+        return LDAPerror(self->ldap);
 
     return PyInt_FromLong(msgid);
 }
@@ -1494,7 +1494,7 @@ l_ldap_extended_operation(LDAPObject *self, PyObject *args)
     LDAPControl_List_DEL(client_ldcs);
 
     if (ldaperror != LDAP_SUCCESS)
-        return LDAPerror(self->ldap, "ldap_extended_operation");
+        return LDAPerror(self->ldap);
 
     return PyInt_FromLong(msgid);
 }
diff --git a/Modules/constants.c b/Modules/constants.c
index a1c79d1..a447310 100644
--- a/Modules/constants.c
+++ b/Modules/constants.c
@@ -49,7 +49,7 @@ LDAPerr(int errnum)
 
 /* Convert an LDAP error into an informative python exception */
 PyObject *
-LDAPraise_for_message(LDAP *l, char *msg, LDAPMessage *m)
+LDAPraise_for_message(LDAP *l, LDAPMessage *m)
 {
     if (l == NULL) {
         PyErr_SetFromErrno(LDAPexception_class);
@@ -170,10 +170,8 @@ LDAPraise_for_message(LDAP *l, char *msg, LDAPMessage *m)
             PyDict_SetItemString(info, "info", str);
             Py_XDECREF(str);
         }
-        else if (msg != NULL || (error != NULL && *error != '\0')) {
-            msg = msg ? msg : error;
-
-            str = PyUnicode_FromString(msg);
+        else if (error != NULL && *error != '\0') {
+            str = PyUnicode_FromString(error);
             if (str)
                 PyDict_SetItemString(info, "info", str);
             Py_XDECREF(str);
@@ -188,9 +186,9 @@ LDAPraise_for_message(LDAP *l, char *msg, LDAPMessage *m)
 }
 
 PyObject *
-LDAPerror(LDAP *l, char *msg)
+LDAPerror(LDAP *l)
 {
-    return LDAPraise_for_message(l, msg, NULL);
+    return LDAPraise_for_message(l, NULL);
 }
 
 /* initialise the module constants */
diff --git a/Modules/constants.h b/Modules/constants.h
index f1d84a5..b815094 100644
--- a/Modules/constants.h
+++ b/Modules/constants.h
@@ -11,8 +11,8 @@ extern int LDAPinit_constants(PyObject *m);
 extern PyObject *LDAPconstant(int);
 
 extern PyObject *LDAPexception_class;
-extern PyObject *LDAPerror(LDAP *, char *msg);
-extern PyObject *LDAPraise_for_message(LDAP *, char *msg, LDAPMessage *m);
+extern PyObject *LDAPerror(LDAP *);
+extern PyObject *LDAPraise_for_message(LDAP *, LDAPMessage *m);
 PyObject *LDAPerr(int errnum);
 
 #ifndef LDAP_CONTROL_PAGE_OID
diff --git a/Modules/functions.c b/Modules/functions.c
index 3a43c7c..2a567fd 100644
--- a/Modules/functions.c
+++ b/Modules/functions.c
@@ -25,7 +25,7 @@ l_ldap_initialize(PyObject *unused, PyObject *args)
     PyEval_RestoreThread(save);
 
     if (ret != LDAP_SUCCESS)
-        return LDAPerror(ld, "ldap_initialize");
+        return LDAPerror(ld);
 
     return (PyObject *)newLDAPObject(ld);
 }
diff --git a/Modules/ldapcontrol.c b/Modules/ldapcontrol.c
index 6615598..17f52cb 100644
--- a/Modules/ldapcontrol.c
+++ b/Modules/ldapcontrol.c
@@ -353,13 +353,13 @@ encode_assertion_control(PyObject *self, PyObject *args)
     err = ldap_create(&ld);
     PyEval_RestoreThread(save);
     if (err != LDAP_SUCCESS)
-        return LDAPerror(ld, "ldap_create");
+        return LDAPerror(ld);
 
     err = ldap_create_assertion_control_value(ld, assertion_filterstr,
                                               &ctrl_val);
 
     if (err != LDAP_SUCCESS) {
-        LDAPerror(ld, "ldap_create_assertion_control_value");
+        LDAPerror(ld);
         save = PyEval_SaveThread();
         ldap_unbind_ext(ld, NULL, NULL);
         PyEval_RestoreThread(save);
diff --git a/Modules/message.c b/Modules/message.c
index 2c05488..d225a1d 100644
--- a/Modules/message.c
+++ b/Modules/message.c
@@ -53,7 +53,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
         if (dn == NULL) {
             Py_DECREF(result);
             ldap_msgfree(m);
-            return LDAPerror(ld, "ldap_get_dn");
+            return LDAPerror(ld);
         }
 
         attrdict = PyDict_New();
@@ -69,7 +69,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
             Py_DECREF(result);
             ldap_msgfree(m);
             ldap_memfree(dn);
-            return LDAPerror(ld, "ldap_get_entry_controls");
+            return LDAPerror(ld);
         }
 
         /* convert serverctrls to list of tuples */
@@ -81,7 +81,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
             ldap_msgfree(m);
             ldap_memfree(dn);
             ldap_controls_free(serverctrls);
-            return LDAPerror(ld, "LDAPControls_to_List");
+            return LDAPerror(ld);
         }
         ldap_controls_free(serverctrls);
 
@@ -201,7 +201,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
             Py_DECREF(reflist);
             Py_DECREF(result);
             ldap_msgfree(m);
-            return LDAPerror(ld, "ldap_parse_reference");
+            return LDAPerror(ld);
         }
         /* convert serverctrls to list of tuples */
         if (!(pyctrls = LDAPControls_to_List(serverctrls))) {
@@ -212,7 +212,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
             Py_DECREF(result);
             ldap_msgfree(m);
             ldap_controls_free(serverctrls);
-            return LDAPerror(ld, "LDAPControls_to_List");
+            return LDAPerror(ld);
         }
         ldap_controls_free(serverctrls);
         if (refs) {
@@ -255,7 +255,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
                      0) != LDAP_SUCCESS) {
                     Py_DECREF(result);
                     ldap_msgfree(m);
-                    return LDAPerror(ld, "ldap_parse_intermediate");
+                    return LDAPerror(ld);
                 }
                 /* convert serverctrls to list of tuples */
                 if (!(pyctrls = LDAPControls_to_List(serverctrls))) {
@@ -267,7 +267,7 @@ LDAPmessage_to_python(LDAP *ld, LDAPMessage *m, int add_ctrls,
                     ldap_controls_free(serverctrls);
                     ldap_memfree(retoid);
                     ber_bvfree(retdata);
-                    return LDAPerror(ld, "LDAPControls_to_List");
+                    return LDAPerror(ld);
                 }
                 ldap_controls_free(serverctrls);