3 files changed, 11 insertions, 6 deletions
diff --git a/src/H5A.c b/src/H5A.c
index 275c350..2397b2a 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -963,8 +963,9 @@ H5Aget_type(hid_t attr_id)
     }
     /* Mark any VL datatypes as being in memory now */
     if(H5T_get_class(dst)==H5T_VLEN) {
-	    if (H5T_vlen_set_loc(dst, NULL, H5T_VLEN_MEMORY)<0) {
-            HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid VL location");
+	if (H5T_vlen_set_loc(dst, NULL, H5T_VLEN_MEMORY)<0) {
+            HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+			  "invalid VL location");
         }
     }
     if (H5T_lock(dst, FALSE)<0) {
diff --git a/src/H5D.c b/src/H5D.c
index 614bda6..d84a856 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -459,8 +459,9 @@ H5Dget_type(hid_t dset_id)
     }
     /* Mark any VL datatypes as being in memory now */
     if(H5T_get_class(copied_type)==H5T_VLEN) {
-	    if (H5T_vlen_set_loc(copied_type, NULL, H5T_VLEN_MEMORY)<0) {
-            HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "invalid VL location");
+	if (H5T_vlen_set_loc(copied_type, NULL, H5T_VLEN_MEMORY)<0) {
+            HRETURN_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,
+			  "invalid VL location");
         }
     }
     if (H5T_lock (copied_type, FALSE)<0) {
diff --git a/src/H5R.c b/src/H5R.c
index 274b69f..6535ebf 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -733,8 +733,11 @@ H5Rget_object_type(hid_t dataset, void *_ref)
 		     "invalid reference pointer");
 
     /* Get the object information */
-    ret_value=H5R_get_object_type(dset,_ref);
-
+    if ((ret_value=H5R_get_object_type(dset,_ref))<0) {
+	HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN,
+		    "unable to determine object type");
+    }
+    
 done:
     FUNC_LEAVE(ret_value);
 }   /* end H5Rget_object_type() */