Russell Francis - 2008-06-10

Patch to resolve NPE.