Jeff,

>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.

Yes, this is a good resolution of the problem. I'll be making a change to both version 3.6 and 4.0 and giving you credit in the What's New Guide. We have a few other updates to do, so we'll send an email notification to all current users when its ready.

Best Regards,