Addresses Data adapter error message issue raised in #62