So I decided to recreate the FillBy and GetDataBy methods in the DataSet editor and the problem went away.
Not sure what had changed, I had not touched the database structure in any way, but re-running the configure wizard solved the problem!
Cheers,
Roy