1 files changed, 3 insertions, 2 deletions

diff --git a/src/coding.c b/src/coding.c
index 21c59454346..8c7ddf34db2 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7905,10 +7905,11 @@ detect_coding_system (src, src_chars, src_bytes, highest, multibytep,
             }
         }
 
-      if ((detect_info.rejected & CATEGORY_MASK_ANY) == CATEGORY_MASK_ANY)
+      if ((detect_info.rejected & CATEGORY_MASK_ANY) == CATEGORY_MASK_ANY
+          || null_byte_found)
         {
           detect_info.found = CATEGORY_MASK_RAW_TEXT;
-          id = coding_categories[coding_category_raw_text].id;
+          id = CODING_SYSTEM_ID (Qno_conversion);
           val = Fcons (make_number (id), Qnil);
         }
       else if (! detect_info.rejected && ! detect_info.found)