prevent to type is null
Merge branch 'hotfix/1.0.1'