VID-1677 Provide defaults rather than pad with null