Bug 925962 - Add missing isValid() check.