[OPENENGSB-3761] handle null values correctly