diff --git a/lib/redis/rediswriter.cpp b/lib/redis/rediswriter.cpp
index 5d75f5b70..722d2a323 100644
--- a/lib/redis/rediswriter.cpp
+++ b/lib/redis/rediswriter.cpp
@@ -67,6 +67,10 @@ void RedisWriter::ConnectionThreadProc(void)
 		if (!password.IsEmpty()) {
 			redisReply *reply = reinterpret_cast<redisReply *>(redisCommand(m_Context, "AUTH %s", password.CStr()));
 
+			//TODO: Verify if we can continue here.
+			if (!reply)
+				continue;
+
 			if (reply->type == REDIS_REPLY_STATUS || reply->type == REDIS_REPLY_ERROR) {
 				Log(LogInformation, "RedisWriter")
 				    << "AUTH: " << reply->str;