diff --git a/src/server/game/Chat/Hyperlinks.cpp b/src/server/game/Chat/Hyperlinks.cpp
index d71316cb5ba..f66df9b4348 100644
--- a/src/server/game/Chat/Hyperlinks.cpp
+++ b/src/server/game/Chat/Hyperlinks.cpp
@@ -39,8 +39,12 @@ HyperlinkInfo Trinity::Hyperlinks::ParseHyperlink(char const* pos)
         return nullptr;
     uint32 color = 0;
     for (uint8 i = 0; i < 8; ++i)
+    {
         if (uint8 hex = toHex(*(pos++)))
             color = (color << 4) | (hex & 0xf);
+        else
+            return nullptr;
+    }
     // link data start tag
     if (*(pos++) != '|' || *(pos++) != 'H')
         return nullptr;