diff --git a/source/md.h b/source/md.h
index 42e2950..c177bd5 100644
--- a/source/md.h
+++ b/source/md.h
@@ -452,9 +452,8 @@ typedef enum MD_TokenKind
     MD_TokenKind_Newline,
     MD_TokenKind_WhitespaceMax,
     
-    MD_TokenKind_NonASCII,
-    // Provisional category to deal with single characters > 127
-    // while we don't support encodings other than ASCII
+    MD_TokenKind_BadCharacter,
+    // Character outside currently supported encodings
     
     MD_TokenKind_MAX,
 }
diff --git a/source/md_impl.c b/source/md_impl.c
index f5bfa3e..a12a0aa 100644
--- a/source/md_impl.c
+++ b/source/md_impl.c
@@ -1304,7 +1304,7 @@ MD_Parse_LexNext(MD_ParseCtx *ctx)
                 
                 else
                 {
-                    token.kind = MD_TokenKind_NonASCII;
+                    token.kind = MD_TokenKind_BadCharacter;
                     at += 1;
                 }
             }break;
@@ -1708,10 +1708,17 @@ _MD_ParseOneNode(MD_ParseCtx *ctx)
         goto end_parse;
     }
     
-    else if(MD_Parse_RequireKind(ctx, MD_TokenKind_NonASCII,     &token))
+    else if(MD_Parse_RequireKind(ctx, MD_TokenKind_BadCharacter, &token))
     {
         result.node = MD_MakeNodeFromToken(MD_NodeKind_Label, ctx->filename, ctx->file_contents.str, ctx->at, token);
-        _MD_Error(ctx, result.node, ctx->at-1, 0, "Non-ASCII character %d", token.string.str[0]);
+
+        MD_String8List bytes = {0};
+        for(int i_byte = 0; i_byte < token.outer_string.size; ++i_byte)
+        {
+            MD_PushStringToList(&bytes, MD_PushStringF("0x%02X", token.outer_string.str[i_byte]));
+        }
+        MD_String8 byte_string = MD_JoinStringListWithSeparator(bytes, MD_S8Lit(" "));
+        _MD_Error(ctx, result.node, ctx->at-1, 0, "Non-ASCII character \"%.*s\"", MD_StringExpand(byte_string));
     }
     
     end_parse:;