[Contrib: Evaluation System] evalsys-1177

[Adam Marshall]

Thanks for pointing out the errors in this patch and proposing a solution. I suspect we are not using the functionality that exposes the null pointers and as the code was written for us by a third party (and then modified) we are not 100% 'at one' with it.

Marc is looking into to it as we speak but may have to wait until tomorrow to actually fix it when Matthew is back in the office.

adam