Added a little better error handling as well as H5C and GDN.