diff --git a/src/sbbs3/js_msgbase.c b/src/sbbs3/js_msgbase.c
index 179dbbf4f56c46d4cf34b960828ec0f44dfab107..815906374d5a2b85faa9f1188d29a4d92ae2abc6 100644
--- a/src/sbbs3/js_msgbase.c
+++ b/src/sbbs3/js_msgbase.c
@@ -2628,7 +2628,12 @@ js_save_msg(JSContext *cx, uintN argc, jsval *arglist)
 		body=strdup("");
 
 	if(rcpt_list!=NULL) {
-		if(!JS_GetArrayLength(cx, rcpt_list, &rcpt_list_length) || !rcpt_list_length) {
+		if(!JS_GetArrayLength(cx, rcpt_list, &rcpt_list_length)) {
+			free(body);
+			return JS_TRUE;
+		}
+		if(rcpt_list_length < 1) {
+			JS_ReportError(cx, "Empty recipient list");
 			free(body);
 			return JS_TRUE;
 		}