Merge: new warning: useless null test