Fixed Null Reference issue in ListFieldWrappers
Merge branch 'hotfix/Null_Reference_Fix' into develop