diff --git a/src/PepperDash.Essentials.Core/Devices/ProcessorExtensionDeviceFactory.cs b/src/PepperDash.Essentials.Core/Devices/ProcessorExtensionDeviceFactory.cs
index 469d18ec..c8528c4a 100644
--- a/src/PepperDash.Essentials.Core/Devices/ProcessorExtensionDeviceFactory.cs
+++ b/src/PepperDash.Essentials.Core/Devices/ProcessorExtensionDeviceFactory.cs
@@ -21,7 +21,9 @@ namespace PepperDash.Essentials.Core
       {
         //Debug.LogMessage(LogEventLevel.Verbose, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
         var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
-        string description = descriptionAttribute[0].Description;
+        string description = descriptionAttribute != null && descriptionAttribute.Length > 0 
+            ? descriptionAttribute[0].Description 
+            : throw new InvalidOperationException($"No DescriptionAttribute found for type {typeof(T).FullName}");
         var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];
         ProcessorExtensionDeviceFactory.AddFactoryForType(typeName.ToLower(), description, typeof(T), BuildDevice);
       }
diff --git a/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs b/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs
index 08aa67cf..9f644b04 100644
--- a/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs
+++ b/src/PepperDash.Essentials.Core/Factory/DeviceFactory.cs
@@ -92,9 +92,11 @@ namespace PepperDash.Essentials.Core
         {
             foreach (var typeName in deviceFactory.TypeNames)
             {
-                //Debug.LogMessage(LogEventLevel.Verbose, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
+                
                 var descriptionAttribute = deviceFactory.FactoryType.GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
-                string description = descriptionAttribute[0].Description;
+                string description = descriptionAttribute != null && descriptionAttribute.Length > 0 
+                    ? descriptionAttribute[0].Description 
+                    : "No description available";
                 var snippetAttribute = deviceFactory.FactoryType.GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];
                 AddFactoryForType(typeName.ToLower(), description, deviceFactory.FactoryType, deviceFactory.BuildDevice);
             }