diff --git a/LibHac/Keyset.cs b/LibHac/Keyset.cs
index 9f25203f..2d68d367 100644
--- a/LibHac/Keyset.cs
+++ b/LibHac/Keyset.cs
@@ -539,6 +539,7 @@ namespace LibHac
 
     public enum KeyType
     {
+        None,
         Common,
         Unique,
         Title
diff --git a/LibHac/MissingKeyException.cs b/LibHac/MissingKeyException.cs
index 8d1e1b4d..f9272dc9 100644
--- a/LibHac/MissingKeyException.cs
+++ b/LibHac/MissingKeyException.cs
@@ -75,5 +75,25 @@ namespace LibHac
             base.GetObjectData(info, context);
             info.AddValue(nameof(Name), Name);
         }
+
+        public override string Message
+        {
+            get
+            {
+                string s = base.Message;
+
+                if (Type != KeyType.None)
+                {
+                    s += $"{Environment.NewLine}Key Type: {Type}";
+                }
+
+                if (Name != null)
+                {
+                    s += $"{Environment.NewLine}Key Name: {Name}";
+                }
+
+                return s;
+            }
+        }
     }
 }