diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index adcf69d..e189379 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4890,6 +4890,9 @@
         case 2:
         case 3:
         case 4:
+            if (s == end || consumed) {
+                goto End;
+            }
             errmsg = "invalid continuation byte";
             startinpos = s - starts;
             endinpos = startinpos + ch - 1;