Bug 22619: Fix null empty behaviour for new rules