diff --git a/source/common/ahuuids.c b/source/common/ahuuids.c
index 523f355183..c4924e16f7 100644
--- a/source/common/ahuuids.c
+++ b/source/common/ahuuids.c
@@ -185,6 +185,13 @@ AcpiAhMatchUuid (
 
     for (Info = AcpiUuids; Info->Description; Info++)
     {
+        /* Null string means desciption is a UUID class */
+
+        if (!Info->String)
+        {
+            continue;
+        }
+
         AcpiUtConvertStringToUuid (Info->String, UuidBuffer);
 
         if (!ACPI_MEMCMP (Data, UuidBuffer, UUID_BUFFER_LENGTH))