diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php
index 34c7e669..bc1b01f9 100644
--- a/php/src/Docker/DockerActionManager.php
+++ b/php/src/Docker/DockerActionManager.php
@@ -125,7 +125,7 @@ class DockerActionManager
         $url = $this->BuildApiUrl(sprintf('containers/%s', urlencode($container->GetIdentifier())));
         try {
             $this->guzzleClient->delete($url);
-        } catch (ClientException $e) {
+        } catch (\GuzzleHttp\Exception\RequestException $e) {
             if ($e->getCode() !== 404) {
                 throw $e;
             }
@@ -430,7 +430,7 @@ class DockerActionManager
                     ],
                 ]
             );
-        } catch (ClientException $e) {}
+        } catch (\GuzzleHttp\Exception\RequestException $e) {}
     }
 
     private function ConnectContainerIdToNetwork(string $id)
@@ -488,7 +488,11 @@ class DockerActionManager
         $url = $this->BuildApiUrl(sprintf('containers/%s/stop?t=%s', urlencode($container->GetIdentifier()), $container->GetMaxShutdownTime()));
         try {
             $this->guzzleClient->post($url);
-        } catch (\Exception $e) {}
+        } catch (\GuzzleHttp\Exception\RequestException $e) {
+            if ($e->getCode() !== 404 && $e->getCode() !== 304) {
+                throw $e;
+            }
+        }
     }
 
     public function GetBackupcontainerExitCode() : int