Fixed null handling from dataform.js update