diff --git a/SabreTools.Core/Tools/AttributeHelper.cs b/SabreTools.Core/Tools/AttributeHelper.cs
index f0af3984..e66dfe2f 100644
--- a/SabreTools.Core/Tools/AttributeHelper.cs
+++ b/SabreTools.Core/Tools/AttributeHelper.cs
@@ -37,7 +37,7 @@ namespace SabreTools.Core.Tools
 
             // Try to get the relevant attribute
             var attributes = enumValueMemberInfo.GetCustomAttributes(typeof(MappingAttribute), true);
-            if (attributes == null)
+            if (attributes == null || attributes.Length == 0)
                 return null;
 
             // Return the first attribute, if possible