1 files changed, 12 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
index 326e5a8299..67aea3f5a5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
@@ -478,8 +478,14 @@ namespace MonoDevelop.Components.Commands
 			}
 #endif
 			// Handle the GDK key via MD commanding
-			if (ProcessKeyEventCore (ev))
-				return true;
+			try {
+				if (ProcessKeyEventCore (ev)) {
+					return true;
+				}
+			} catch (Exception ex) {
+				LoggingService.LogInternalError ("Exception while parsing command", ex);
+				return false;
+			}
 
 #if MAC
 			// Otherwise if we have a native first responder that is not the GdkQuartzView
@@ -547,6 +553,10 @@ namespace MonoDevelop.Components.Commands
 				return false;
 			}
 
+			if (commands == null) {
+				return false;
+			}
+
 			var toplevelFocus = IdeApp.Workbench.HasToplevelFocus;
 
 			var conflict = new List<Command> ();