diff --git a/assignments/A3/message.js b/assignments/A3/message.js
index 9af0c5f..1b713ea 100644
--- a/assignments/A3/message.js
+++ b/assignments/A3/message.js
@@ -8,13 +8,16 @@ function match(message, headers) {
 }
 
 function body(message) {
-	if (message["body"][0]["content-type"] === "text/plain") {
-		return message["body"][0]["content"];
-	}
-	/* istanbul ignore else */
-	if (message["body"][0]["content-type"] === "multipart/signed") {
-		return message["body"][0]["content"][0]["content"];
+	if (message["body"] !== undefined) {
+		if (message["body"][0]["content-type"] === "text/plain") {
+			return message["body"][0]["content"];
+		}
+		/* istanbul ignore else */
+		if (message["body"][0]["content-type"] === "multipart/signed") {
+			return message["body"][0]["content"][0]["content"];
+		}
 	}
+	return undefined;
 }
 
 function string(message) {