Bug 22729: (QA follow-up) Ensure no NULL values before setting NOT NULL