2 files changed, 3 insertions, 1 deletions
diff --git a/src/H5PLint.c b/src/H5PLint.c
index 4995adb..4c970c5 100644
--- a/src/H5PLint.c
+++ b/src/H5PLint.c
@@ -259,6 +259,8 @@ H5PL_load(H5PL_type_t type, const H5PL_key_t *key)
     /* Set the return value we found the plugin */
     if (found)
         ret_value = plugin_info;
+    else
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOTFOUND, NULL, "unable to locate plugin")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5VL.c b/src/H5VL.c
index fb7af97..8ff5f26 100644
--- a/src/H5VL.c
+++ b/src/H5VL.c
@@ -967,7 +967,7 @@ H5VLquery_optional(hid_t obj_id, H5VL_subclass_t subcls, int opt_type, uint64_t
     /* Check args */
     if (NULL == flags)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid 'flags' pointer")
-    if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(obj_id)))
+    if (NULL == (vol_obj = H5VL_vol_object(obj_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid object identifier")
 
     /* Query the connector */