diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
index 4c130a93..bc5fc7fe 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
@@ -105,10 +105,16 @@ public class ValidateCodeServiceImpl implements ValidateCodeService
         }
         if (StringUtils.isEmpty(uuid))
         {
-            throw new CaptchaException("验证码已失效");
+            throw new CaptchaException("uuid不能为空");
         }
+        
         String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
         String captcha = redisService.getCacheObject(verifyKey);
+        if (captcha == null)
+        {
+            throw new CaptchaException("验证码已失效");
+        }
+
         redisService.deleteObject(verifyKey);
 
         if (!code.equalsIgnoreCase(captcha))