Improve error reporting in datastore_delete