diff --git a/PWManager.CLI/ConsoleRunner.cs b/PWManager.CLI/ConsoleRunner.cs
index 88d4d52..7ed9d94 100644
--- a/PWManager.CLI/ConsoleRunner.cs
+++ b/PWManager.CLI/ConsoleRunner.cs
@@ -33,12 +33,19 @@ public void Run(string[] args) {
                         continue;
                     }
 
-                    exitCondition = ExecuteCommand(input);
+                    try {
+                        exitCondition = ExecuteCommand(input);
+                    }catch (UserFeedbackException ex) {
+                        Console.WriteLine(ex.Message);
+                        if (_environment.RunningSession) {
+                            exitCondition = ExitCondition.CONTINUE;
+                            continue;
+                        }
+
+                        return;
+                    }
                 }
             }
-            catch (UserFeedbackException ex) {
-                Console.WriteLine(ex.Message);
-            }
             catch (Exception ex) {
                 Console.WriteLine("An Error occured!");
                 if (_environment.IsDevelopmentMode) {