diff --git a/ICD.Common.Utils/Extensions/ReflectionExtensions.cs b/ICD.Common.Utils/Extensions/ReflectionExtensions.cs index 79f344b..7986791 100644 --- a/ICD.Common.Utils/Extensions/ReflectionExtensions.cs +++ b/ICD.Common.Utils/Extensions/ReflectionExtensions.cs @@ -42,7 +42,15 @@ namespace ICD.Common.Utils.Extensions if (extends == null) throw new ArgumentNullException("extends"); - return extends.GetCustomAttributes(typeof(T), inherits).Cast(); + try + { + return extends.GetCustomAttributes(typeof(T), inherits).Cast(); + } + // Crestron bug? + catch (ArgumentNullException) + { + return Enumerable.Empty(); + } } ///