diff --git a/src/H5E.c b/src/H5E.c
index 52b7cb74b8..07eaf18e1a 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -866,7 +866,7 @@ H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg_str, size_t size)
     H5E_msg_t   *msg;           /* Pointer to error message */
     ssize_t      ret_value = -1;     /* Return value */
 
-    FUNC_ENTER_API((-1))
+    FUNC_ENTER_API_NOCLEAR((-1))
     H5TRACE4("Zs", "i*Et*sz", msg_id, type, msg_str, size);
 
     /* Get the message object */
diff --git a/src/H5Eint.c b/src/H5Eint.c
index 7818879519..e76db826d2 100644
--- a/src/H5Eint.c
+++ b/src/H5Eint.c
@@ -883,11 +883,11 @@ H5E__clear_entries(H5E_t *estack, size_t nentries)
 
         /* Release strings */
         if(error->func_name)
-            H5MM_xfree((void *)error->func_name);        /* Casting away const OK - QAK */
+            error->func_name = (const char *) H5MM_xfree((void *)error->func_name);        /* Casting away const OK - QAK */
         if(error->file_name)
-            H5MM_xfree((void *)error->file_name);        /* Casting away const OK - QAK */
+            error->file_name = (const char *) H5MM_xfree((void *)error->file_name);        /* Casting away const OK - QAK */
         if(error->desc)
-            H5MM_xfree((void *)error->desc);     /* Casting away const OK - QAK */
+            error->desc = (const char *) H5MM_xfree((void *)error->desc);     /* Casting away const OK - QAK */
     } /* end for */
 
     /* Decrement number of errors on stack */