Fix an NPE I've introduced while investigating TAP5-1493.