Index: xymond/xymond_rrd.c
===================================================================
--- xymond/xymond_rrd.c	(revision 7165)
+++ xymond/xymond_rrd.c	(working copy)
@@ -329,7 +329,7 @@
 		}
 		metadata[metacount] = NULL;
 
-		if ((metacount >= 14) && (strncmp(metadata[0], "@@status", 8) == 0)) {
+		if ((metacount >= 14) && (strncmp(metadata[0], "@@status", 8) == 0) && restofmsg) {
 			/*
 			 * @@status|timestamp|sender|origin|hostname|testname|expiretime|color|testflags|\
 			 * prevcolor|changetime|ackexpiretime|ackmessage|disableexpiretime|disablemessage|\
@@ -357,7 +357,7 @@
 				break;
 			}
 		}
-		else if ((metacount > 5) && (strncmp(metadata[0], "@@data", 6) == 0)) {
+		else if ((metacount > 5) && (strncmp(metadata[0], "@@data", 6) == 0) && restofmsg) {
 			/* @@data|timestamp|sender|origin|hostname|testname|classname|pagepaths */
 			tstamp = atoi(metadata[1]);
 			sender = metadata[2];