diff --git a/SRC/echoping.c b/SRC/echoping.c
index 6374945..9a86970 100644
--- a/SRC/echoping.c
+++ b/SRC/echoping.c
@@ -699,7 +699,7 @@ main(argc, argv)
 	if (smtp) {
 		sendline = "QUIT\r\n";	/* Surprises some SMTP servers which log a
 					 * frightening NOQUEUE. Anyone knows better? 
-					 * * * * * * See bug #1512776 */
+					 * See bug #1512776 */
 	} else
 #endif
 #ifdef ICP
@@ -1374,7 +1374,9 @@ main(argc, argv)
 		(void) gettimeofday(&newtv, (struct timezone *) NULL);
 		temp = newtv;
 		tvsub(&temp, &oldtv);
-		if (!timeout_flag) {
+		if (!timeout_flag && (!plugin || plugin_result == 0)) {	/* If it
+									 * worked... 
+									 */
 			tvadd(&total, &temp);
 
 			/* Check */
@@ -1431,8 +1433,7 @@ main(argc, argv)
 				results[i - 1].timevalue = measured;
 			else
 				results[i - 1].timevalue = newtv;
-			if (!plugin || (plugin_result == 0))
-				successes++;
+			successes++;
 		}
 		if (number > 1) {
 #ifdef OPENSSL