From 9a783df90ad4375b349be3c6132ac43b09eaf7ef Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Tue, 3 Nov 2015 21:01:42 -0400
Subject: [PATCH] Fixed a couple arg parsing errors

---
 src/Discord.Net.Commands/CommandMap.cs    | 2 ++
 src/Discord.Net.Commands/CommandParser.cs | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Discord.Net.Commands/CommandMap.cs b/src/Discord.Net.Commands/CommandMap.cs
index c147d47ff..d066a8910 100644
--- a/src/Discord.Net.Commands/CommandMap.cs
+++ b/src/Discord.Net.Commands/CommandMap.cs
@@ -31,6 +31,8 @@ namespace Discord.Commands
 				CommandMap nextGroup;
 				if (_subCommands.TryGetValue(nextPart, out nextGroup))
 					return nextGroup.GetMap(index + 1, parts);
+				else
+					return null;
 			}
 			return this;
 		}
diff --git a/src/Discord.Net.Commands/CommandParser.cs b/src/Discord.Net.Commands/CommandParser.cs
index 14af9f550..90b00e977 100644
--- a/src/Discord.Net.Commands/CommandParser.cs
+++ b/src/Discord.Net.Commands/CommandParser.cs
@@ -148,7 +148,12 @@ namespace Discord.Commands
 			}
 
 			if (argList.Count < command.MinArgs)
-				return CommandErrorType.BadArgCount;
+			{
+				/*if (command._parameters[command._parameters.Length - 1].Type == ParameterType.Unparsed)
+					argList.Add("");
+				else*/
+					return CommandErrorType.BadArgCount;
+			}
 
 			args = argList.ToArray();
 			return null;