1.096: Fixing up a null check