diff --git a/FModel/Framework/ViewModelCommand.cs b/FModel/Framework/ViewModelCommand.cs
index 1730984e..4d064f2e 100644
--- a/FModel/Framework/ViewModelCommand.cs
+++ b/FModel/Framework/ViewModelCommand.cs
@@ -27,7 +27,7 @@ namespace FModel.Framework
 
         protected ViewModelCommand(TContextViewModel contextViewModel)
         {
-            ContextViewModel = contextViewModel ?? throw new ArgumentNullException(nameof(contextViewModel));
+            ContextViewModel = contextViewModel /*?? throw new ArgumentNullException(nameof(contextViewModel))*/;
         }
 
         public sealed override void Execute(object parameter)
diff --git a/FModel/ViewModels/Commands/GoToCommand.cs b/FModel/ViewModels/Commands/GoToCommand.cs
index 13ec2c66..1b9845c3 100644
--- a/FModel/ViewModels/Commands/GoToCommand.cs
+++ b/FModel/ViewModels/Commands/GoToCommand.cs
@@ -32,7 +32,8 @@ namespace FModel.ViewModels.Commands
             {
                 foreach (var folder in root)
                 {
-                    if (!folder.Header.Equals(folders[i])) continue;
+                    if (!folder.Header.Equals(folders[i], i == 0 ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal))
+                        continue;
 
                     folder.IsExpanded = true; // folder found = expand