diff --git a/CHANGELIST.md b/CHANGELIST.md
index 415a5f41..62b1499e 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -40,6 +40,7 @@
 - Compress JSON for artifacts alone
 - Even stricter output for copy protection section
 - Report dictionary to InfoTool
+- Even even stricter copy protection output
 
 ### 2.3 (2022-02-05)
 - Start overhauling Redump information pulling, again
diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs
index c3e858ff..1f7d29cf 100644
--- a/MPF.Library/InfoTool.cs
+++ b/MPF.Library/InfoTool.cs
@@ -766,8 +766,8 @@ namespace MPF.Library
 
                 // Copy Protection section
                 if (!string.IsNullOrWhiteSpace(info.CopyProtection.Protection)
-                    || info.CopyProtection.AntiModchip != YesNo.NULL
-                    || info.CopyProtection.LibCrypt != YesNo.NULL
+                    || (info.CopyProtection.AntiModchip != null && info.CopyProtection.AntiModchip != YesNo.NULL)
+                    || (info.CopyProtection.LibCrypt != null && info.CopyProtection.LibCrypt != YesNo.NULL)
                     || !string.IsNullOrWhiteSpace(info.CopyProtection.LibCryptData)
                     || !string.IsNullOrWhiteSpace(info.CopyProtection.SecuROMData))
                 {