Fix for DB-4979
update to NOT NULL