Fixed adding empty and null Strings.