Bug from master where null condition checked incorrectly