diff --git a/rfc2045.c b/rfc2045.c
index e2e8658..eb23d0c 100644
--- a/rfc2045.c
+++ b/rfc2045.c
@@ -88,7 +88,7 @@ blaze822_multipart(struct message *msg, struct message **imsg)
 		// bcharsnospace := DIGIT / ALPHA / "'" / "(" / ")" /
 		//              "+" / "_" / "," / "-" / "." /
 		//              "/" / ":" / "=" / "?"
-		while(!iswsp(*e) && *e != ';')
+		while (*e && !iswsp(*e) && *e != ';')
 			e++;
 		e++;
 	}