Re-add not nullable field checks