Fix failed exception handling

StrangeRanger · Mar 27, 2024 · a29c211 · a29c211
1 parent 539cf0b
commit a29c211
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs b/ActiveDirectoryQuerier/PowerShell/PSExecutor.cs
@@ -40,12 +40,19 @@ public PSOutput Execute(Command psCommand, OutputFormat outputFormat = OutputFor
 
     public async Task<PSOutput> ExecuteAsync(Command command, OutputFormat outputFormat = OutputFormat.Text)
     {
-        _powerShell.Commands.Clear();
-        AssembleFullCommand(command, outputFormat);
+        try
+        {
+            _powerShell.Commands.Clear();
+            AssembleFullCommand(command, outputFormat);
 
-        PSDataCollection<PSObject> results = await _powerShell.InvokeAsync();
+            PSDataCollection<PSObject> results = await _powerShell.InvokeAsync();
 
-        return ProcessExecutionResults(results);
+            return ProcessExecutionResults(results);
+        }
+        catch (Exception exception)
+        {
+            return HandleExecutionException(exception);
+        }
     }
 
     private void AssembleFullCommand(Command psCommand, OutputFormat outputFormat)