diff --git a/src/http-mserv.c b/src/http-mserv.c
index 46ab9cd42..7794a8f7c 100644
--- a/src/http-mserv.c
+++ b/src/http-mserv.c
@@ -526,7 +526,9 @@ HMS_fetch_rules (char *buffer, size_t buffer_size)
 	if (! hms)
 		return NULL;
 
-	if (HMS_do(hms))
+	boolean ok = HMS_do(hms);
+
+	if (ok)
 	{
 		char *p = strstr(hms->buffer, "\n\n");
 
@@ -542,6 +544,9 @@ HMS_fetch_rules (char *buffer, size_t buffer_size)
 
 	HMS_end(hms);
 
+	if (!ok)
+		return NULL;
+
 	return buffer;
 }