Index: firmware/common/unicode.c
===================================================================
--- firmware/common/unicode.c	(revision 18383)
+++ firmware/common/unicode.c	(working copy)
@@ -141,7 +141,9 @@
     if (!load_cp_table(cp)) cp = 0;
 
     while (count--) {
-        if (*iso < 128 || cp == UTF_8) /* Already UTF-8 */
+        if (*iso == 0)
+            return utf8;
+        else if (*iso < 128 || cp == UTF_8) /* Already UTF-8 */
             *utf8++ = *iso++;
 
         else {