Trap another NPE

NPE was happening at the old line 38.  I have a feeling it's just because "this." was missed out, but I added a null check just in case.