XX-10836 Fixed null string handling