r23574: Remove double-null check (I hate people bitching at me