Merge branch 'hotfix/improperObjectDefinition'
* fix undefined numbers cause a crash here.
Merge branch 'hotfix/checkUndefinedNumber' into develop