diff --git a/src/api/pdc.c b/src/api/pdc.c
index 240141f1c..531ac6b99 100644
--- a/src/api/pdc.c
+++ b/src/api/pdc.c
@@ -218,7 +218,8 @@ PDCclose(pdcid_t pdcid)
     pdc_id_list_g = (struct pdc_id_list *)(intptr_t)PDC_free(pdc_id_list_g);
 
     // Finalize METADATA
-    PDC_Client_finalize();
+    if (PDC_Client_finalize() < 0)
+        PGOTO_ERROR(FAIL, "PDC_Client_finalize failed");
 
 done:
     fflush(stdout);
diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c
index fa1de6c26..63c634fcb 100644
--- a/src/api/pdc_client_connect.c
+++ b/src/api/pdc_client_connect.c
@@ -1755,8 +1755,8 @@ PDC_Client_finalize()
         PGOTO_ERROR(FAIL, "==PDC_CLIENT[%d]: error with HG_Context_destroy", pdc_client_mpi_rank_g);
 
     hg_ret = HG_Finalize(send_class_g);
-    /* if (hg_ret != HG_SUCCESS) */
-    /*     PGOTO_ERROR(FAIL, "==PDC_CLIENT[%d]: error with HG_Finalize", pdc_client_mpi_rank_g); */
+    if (hg_ret != HG_SUCCESS)
+        PGOTO_ERROR(FAIL, "==PDC_CLIENT[%d]: error with HG_Finalize", pdc_client_mpi_rank_g);
 
 done:
     fflush(stdout);