ContructFrom fix null
Merge branch 'ContructFrom-fix-null'