fix string concatenation with null