diff --git a/src/Git/Repository.cs b/src/Git/Repository.cs
index 8771ec32..a5d8f8a9 100644
--- a/src/Git/Repository.cs
+++ b/src/Git/Repository.cs
@@ -516,10 +516,8 @@ namespace SourceGit.Git {
             }, true);
 
             OnSubmoduleChanged?.Invoke();
-
             AssertCommand(errs);
-
-            if (needPopStash) RunCommand("stash pop -q stash@{0}", null);
+            if (needPopStash && errs == null) RunCommand("stash pop -q stash@{0}", null);
         }
 
         /// <summary>