diff --git a/signs.h b/signs.h
--- a/signs.h
+++ b/signs.h
@@ -34,11 +34,6 @@ static inline uint16 GetSignPoolSize(voi
 	return _sign_pool.total_items;
 }
 
-static inline bool IsSignIndex(uint index)
-{
-	return index < GetSignPoolSize();
-}
-
 /**
  * Check if a Sign really exists.
  */
@@ -47,6 +42,11 @@ static inline bool IsValidSign(const Sig
 	return si->str != STR_NULL;
 }
 
+static inline bool IsValidSignID(uint index)
+{
+	return index < GetSignPoolSize() && IsValidSign(GetSign(index));
+}
+
 #define FOR_ALL_SIGNS_FROM(ss, start) for (ss = GetSign(start); ss != NULL; ss = (ss->index + 1 < GetSignPoolSize()) ? GetSign(ss->index + 1) : NULL) if (IsValidSign(ss))
 #define FOR_ALL_SIGNS(ss) FOR_ALL_SIGNS_FROM(ss, 0)