diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c
index 2c53bc936..edeaf3a25 100644
--- a/src/redis-benchmark.c
+++ b/src/redis-benchmark.c
@@ -419,11 +419,10 @@ static void readHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
         fprintf(stderr,"Error: %s\n",c->context->errstr);
         exit(1);
     }
-    else if (strlen(c->context->reader->buf)>=32 
-		    && !strncmp(c->context->reader->buf,"-NOAUTH Authentication required.", 32))
+    else if (NULL != strstr(c->context->reader->buf,"NOAUTH"))
     {
         fprintf(stderr,"Error: %s\n",c->context->reader->buf);
-        exit(1);
+        exit(1);	
     } else {
         while(c->pending) {
             if (redisGetReply(c->context,&reply) != REDIS_OK) {