Try removing one by one the diff you have applied on your client, a simple process of elimination. If the error still persist, then try diffing another client but this time, much newer like 2012-04-10.
If the same error goes with a newer client, then the problem might be on your client files. Check your data folder specially the lua files for something might be missing, try other grf and so on and so forth.