I overrode GetEmptyDataSet(DataSet ds, string tableName, string databaseKey), copied the original code and remarked out the first SetCurrentDataSet() line. It seems to be working fine. I'll keep my eyes open to see if I there are any side effects.

Thanks for your help,
Jeff