fix NPE if field value is null.
Merge branch 'feature/fix_null_field' into maven