2 files changed, 3 insertions, 1 deletions
diff --git a/src/H5E.c b/src/H5E.c
index 9365035..7112d6e 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -616,7 +616,7 @@ H5E_close_msg_cb(void *obj_ptr, hid_t obj_id, void *key)
 
     /* Close the message if it is in the class being closed */
     if(err_msg->cls == cls)
-        if(H5I_remove(obj_id) < 0)
+        if(NULL == H5I_remove(obj_id))
             HGOTO_ERROR(H5E_ERROR, H5E_CANTREMOVE, FAIL, "unable to remove error message")
 
 done:
diff --git a/test/app_ref.c b/test/app_ref.c
index 209a909..cb8be6a 100644
--- a/test/app_ref.c
+++ b/test/app_ref.c
@@ -76,6 +76,8 @@ const char *IDNAME[T_NUMCLASSES] = {
 
 int rc[T_NUMCLASSES];
 
+void Abrt_Handler (int sig);
+
 /* Handler for SIGABRT - prints the reference count on each id */
 void
 Abrt_Handler (int UNUSED sig)