Any chance you can isolate this and simplify it down to a simple entity reproducing the error (SSCCE style)?