Fix for MXSUP-1646:  added check for unicode strings