Improve exception message when protection not found

yck1509 · Nov 18, 2015 · 5a849c7 · 5a849c7
1 parent c79a032
commit 5a849c7
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Confuser.Core/ObfAttrParser.cs b/Confuser.Core/ObfAttrParser.cs
@@ -202,6 +202,9 @@ public void ParseProtectionString(ProtectionSettings settings, string str) {
 
 					case ParseState.EndItem:
 						if (settings != null) {
+							if (!items.Contains(protId))
+								throw new KeyNotFoundException("Cannot find protection with id '" + protId + "'.");
+
 							if (protAct) {
 								settings[(Protection)items[protId]] = protParams;
 							}
@@ -243,7 +246,11 @@ public void ParsePackerString(string str, out Packer packer, out Dictionary<stri
 					case ParseState.ReadItemName:
 						ReadId(buffer);
 
-						packer = (Packer)items[buffer.ToString()];
+						var packerId = buffer.ToString();
+						if (!items.Contains(packerId))
+							throw new KeyNotFoundException("Cannot find packer with id '" + packerId + "'.");
+
+						packer = (Packer)items[packerId];
 						buffer.Length = 0;
 
 						if (IsEnd() || Peek() == ';')