[OPENENGSB-3761] handle null values correctly
[OPENENGSB-3761] fix review issues
Merge pull request #898 from stfnsche/master

[OPENENGSB-3761] handle null values correctly