Added strlength check for message, trying to stamp out NULLs...