diff --git a/src/H5.c b/src/H5.c
index 8a89604e30..549c62ea5e 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -1963,7 +1963,7 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...)
 		    case H5I_TEMPLATE_5:
 		    case H5I_TEMPLATE_6:
 		    case H5I_TEMPLATE_7:
-			switch (H5Pget_class(id_type)) {
+			switch (H5P_get_class(id_type)) {
 			case H5P_FILE_CREATE:
 			    fprintf(out, "H5P_FILE_CREATE");
 			    break;
diff --git a/src/H5P.c b/src/H5P.c
index 90db98d877..1262b7f8bb 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -533,21 +533,12 @@ H5P_close(void *_plist)
 H5P_class_t
 H5Pget_class(hid_t plist_id)
 {
-    H5I_type_t		    group;
     H5P_class_t		    ret_value = H5P_NO_CLASS;
 
     FUNC_ENTER(H5Pget_class, H5P_NO_CLASS);
     H5TRACE1("p","i",plist_id);
 
-    if ((group = H5I_get_type(plist_id)) < 0 ||
-            group >= H5I_TEMPLATE_MAX ||
-            group < H5I_TEMPLATE_0) {
-        HRETURN_ERROR(H5E_ATOM, H5E_BADATOM, H5P_NO_CLASS,
-		      "not a property list");
-    }
-
-    ret_value = (H5P_class_t)(group - H5I_TEMPLATE_0);
-
+    ret_value = H5P_get_class(plist_id);
     FUNC_LEAVE(ret_value);
 }