diff --git a/VCF.Core/Registry/CommandRegistry.cs b/VCF.Core/Registry/CommandRegistry.cs
index 9d7a5bc..77e8ab2 100644
--- a/VCF.Core/Registry/CommandRegistry.cs
+++ b/VCF.Core/Registry/CommandRegistry.cs
@@ -233,12 +233,12 @@ public static CommandResult Handle(ICommandContext ctx, string input)
 		}
 
 		// Get command(s) based on input
-		CacheResult matchedCommand;
+		CacheResult matchedCommand = null;
 		if (assemblyName != null)
 		{
 			matchedCommand = _cache.GetCommandFromAssembly(commandInput, assemblyName);
 		}
-		else
+		if (matchedCommand == null || !matchedCommand.IsMatched)
 		{
 			matchedCommand = _cache.GetCommand(input);
 		}