Fix up the patch from r459623 with a newer upstream commit. One extra
nullptr check had gotten lost along the way. Upstream 8969b3735a.

Approved by: rakuco (mentor)