diff --git a/pandora_console/godmode/um_client/lib/UpdateManager/Client.php b/pandora_console/godmode/um_client/lib/UpdateManager/Client.php
index 0b8c840838..27425f535f 100644
--- a/pandora_console/godmode/um_client/lib/UpdateManager/Client.php
+++ b/pandora_console/godmode/um_client/lib/UpdateManager/Client.php
@@ -1276,6 +1276,7 @@ class Client
             $file = trim(str_replace("\0", '', $this->productPath.'/'.$file));
             if (file_exists($file) === true
                 && is_file($delete_files_txt) === true
+                && is_dir($file) === false
             ) {
                 unlink($file);
                 $processed[$file] = 'removed';
diff --git a/pandora_console/godmode/um_client/tests/ClientTest.php b/pandora_console/godmode/um_client/tests/ClientTest.php
index 9f5deebd12..69ac73cbb9 100644
--- a/pandora_console/godmode/um_client/tests/ClientTest.php
+++ b/pandora_console/godmode/um_client/tests/ClientTest.php
@@ -183,7 +183,7 @@ class ClientTest extends \PHPUnit\Framework\TestCase
         try {
             $this->conf = new \Config('client/conf/test.ini');
         } catch (\Exception $e) {
-            $this->fail($e->xdebug_message);
+            $this->fail($e->getMessage());
         }
 
         // Verify endpoint has all needed stuff, like licenses and OUM packages.
@@ -510,7 +510,12 @@ class ClientTest extends \PHPUnit\Framework\TestCase
 
         $this->assertEquals(0, $umc_enterprise->getMR());
 
-        $umc_enterprise->updateLastVersion();
+        try {
+            $umc_enterprise->updateLastVersion();
+        } catch (\Exception $e) {
+            echo $e->getTraceAsString();
+            $this->fail('Failed while updating: '.$e->getMessage());
+        }
 
         $this->assertEquals(
             4,