Hi all,

Marco pointed out that my last commit didn't fix the
NullPointerException.  This commit ought to.

Cheers,
Gary