Patch Set 1: I would prefer that you didn't submit this

(1 inline comment)

Change looks like it fixes the bug, but the surrounding context is now a bit more confusing due to a pointless null check.