diff --git a/workflow/engine/classes/class.cli.php b/workflow/engine/classes/class.cli.php
index b610602b2..9d75ca6f7 100644
--- a/workflow/engine/classes/class.cli.php
+++ b/workflow/engine/classes/class.cli.php
@@ -290,18 +290,14 @@ EOT;
                 $taskOpts[$validOpts[$optName]] = $optArg;
             }
         } catch (Exception $e) {
-            $token = strtotime("now");
-            PMException::registerErrorLog($e, $token);
-            echo self::error( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
+            echo self::error( "Invalid options: " . $e->getMessage() ) . "\n\n";
             self::help( $taskName );
             return;
         }
         try {
             call_user_func( $taskData['function'], $arguments, $taskOpts );
         } catch (Exception $e) {
-            $token = strtotime("now");
-            PMException::registerErrorLog($e, $token);
-            echo self::error( G::LoadTranslation("ID_EXCEPTION_LOG_INTERFAZ", array($token)) );
+            echo self::error( "\n  Error executing '$taskName':\n\n  {$e->getMessage()}\n" ) . "\n";
             global $tempDirectory;
             if (!empty($tempDirectory)) {
                 G::rm_dir($tempDirectory);
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 29d8be18d..f59bb7ca8 100644
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1701,19 +1701,6 @@ class workspaceTools
 
             if (Installer::isset_site($workspaceName)) {
                 if ($overwrite) {
-                    if ($workspace->dbInfo['DB_NAME'] == $workspace->dbInfo['DB_RBAC_NAME']) {
-                        $newDatabases = 1;
-                    } else {
-                        $newDatabases = 3;
-                    }
-
-                    if ($newDatabases != $oldDatabases) {
-                        throw new Exception("We can't overwrite this workspace because it has a different amount of databases. Not only the 'source' but also the 'target' must have the same amount of databases.");
-                    }
-
-                    if (!$workspace->workspaceExists()) {
-                        throw new Exception('We can not overwrite this workspace because the workspace ' . $workspaceName . ' does not exist please check the lower case and upper case.');
-                    }
                     CLI::logging(CLI::warning("> Workspace $workspaceName already exist, overwriting!") . "\n");
                 } else {
                     throw new Exception("Destination workspace already exist (use -o to overwrite)");