1 files changed, 4 insertions, 0 deletions
diff --git a/src/H5D.c b/src/H5D.c
index 569248e..4516532 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -150,6 +150,10 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
     if((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
 	HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset")
 
+    /* Create index if told to */
+    if(H5X_can_create(ret_value, dcpl_id) < 0)
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTCREATE, FAIL, "Index can't be created on this dataset")
+
 done:
     if(ret_value < 0)
         if(dset && H5D_close(dset) < 0)