Add missing  function to properly validate the model on change
Add check for null/undefined values