diff --git a/app/code/Magento/Downloadable/Console/Command/DomainsAddCommand.php b/app/code/Magento/Downloadable/Console/Command/DomainsAddCommand.php
index 7155adeadaf09..6e7ac77b8b261 100644
--- a/app/code/Magento/Downloadable/Console/Command/DomainsAddCommand.php
+++ b/app/code/Magento/Downloadable/Console/Command/DomainsAddCommand.php
@@ -1,18 +1,19 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Downloadable\Console\Command;
 
 use Exception;
+use InvalidArgumentException;
 use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Downloadable\Helper\Download as DownloadManager;
 
 /**
  * Class DomainsAddCommand
@@ -31,14 +32,22 @@ class DomainsAddCommand extends Command
      */
     private $domainManager;
 
+    /**
+     * @var DownloadManager
+     */
+    private $downloadManager;
+
     /**
      * DomainsAddCommand constructor.
      * @param DomainManager $domainManager
+     * @param DownloadManager $downloadManager
      */
     public function __construct(
-        DomainManager $domainManager
+        DomainManager   $domainManager,
+        DownloadManager $downloadManager
     ) {
         $this->domainManager = $domainManager;
+        $this->downloadManager = $downloadManager;
         parent::__construct();
     }
 
@@ -69,27 +78,24 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
-            if ($input->getArgument(self::INPUT_KEY_DOMAINS)) {
-                $whitelistBefore = $this->domainManager->getDomains();
-                $newDomains = $input->getArgument(self::INPUT_KEY_DOMAINS);
-                $newDomains = array_filter(array_map('trim', $newDomains), 'strlen');
+            $domains = $input->getArgument(self::INPUT_KEY_DOMAINS);
+
+            $this->downloadManager->validateDomains($domains);
 
-                $this->domainManager->addDomains($newDomains);
+            $whitelistBefore = $this->domainManager->getDomains();
+            $newDomains = array_filter(array_map('trim', $domains), 'strlen');
 
-                foreach (array_diff($this->domainManager->getDomains(), $whitelistBefore) as $newHost) {
-                    $output->writeln(
-                        $newHost . ' was added to the whitelist.' . PHP_EOL
-                    );
-                }
+            $this->domainManager->addDomains($newDomains);
+
+            foreach (array_diff($this->domainManager->getDomains(), $whitelistBefore) as $newHost) {
+                $output->writeln($newHost . ' was added to the whitelist.' . PHP_EOL);
             }
+
+            return Cli::RETURN_SUCCESS;
+        } catch (InvalidArgumentException $e) {
+            return $this->downloadManager->handleInvalidArgumentException($e, $output);
         } catch (Exception $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
-            if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
-                $output->writeln($e->getTraceAsString());
-            }
-            return Cli::RETURN_FAILURE;
+            return $this->downloadManager->handleException($e, $output);
         }
-
-        return Cli::RETURN_SUCCESS;
     }
 }
diff --git a/app/code/Magento/Downloadable/Console/Command/DomainsRemoveCommand.php b/app/code/Magento/Downloadable/Console/Command/DomainsRemoveCommand.php
index d3acb8e4ae75a..d4e631656ee2e 100644
--- a/app/code/Magento/Downloadable/Console/Command/DomainsRemoveCommand.php
+++ b/app/code/Magento/Downloadable/Console/Command/DomainsRemoveCommand.php
@@ -1,18 +1,19 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Downloadable\Console\Command;
 
 use Exception;
+use InvalidArgumentException;
 use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Downloadable\Helper\Download as DownloadManager;
 
 /**
  * Class DomainsRemoveCommand
@@ -31,15 +32,23 @@ class DomainsRemoveCommand extends Command
      */
     private $domainManager;
 
+    /**
+     * @var DownloadManager
+     */
+    private $downloadManager;
+
     /**
      * DomainsRemoveCommand constructor.
      *
      * @param DomainManager $domainManager
+     * @param DownloadManager $downloadManager
      */
     public function __construct(
-        DomainManager $domainManager
+        DomainManager   $domainManager,
+        DownloadManager $downloadManager
     ) {
         $this->domainManager = $domainManager;
+        $this->downloadManager = $downloadManager;
         parent::__construct();
     }
 
@@ -70,26 +79,24 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
-            if ($input->getArgument(self::INPUT_KEY_DOMAINS)) {
-                $whitelistBefore = $this->domainManager->getDomains();
-                $removeDomains = $input->getArgument(self::INPUT_KEY_DOMAINS);
-                $removeDomains = array_filter(array_map('trim', $removeDomains), 'strlen');
-                $this->domainManager->removeDomains($removeDomains);
+            $domains = $input->getArgument(self::INPUT_KEY_DOMAINS);
+
+            $this->downloadManager->validateDomains($domains);
 
-                foreach (array_diff($whitelistBefore, $this->domainManager->getDomains()) as $removedHost) {
-                    $output->writeln(
-                        $removedHost . ' was removed from the whitelist.'
-                    );
-                }
+            $whitelistBefore = $this->domainManager->getDomains();
+            $removedDomains = array_filter(array_map('trim', $domains), 'strlen');
+
+            $this->domainManager->removeDomains($removedDomains);
+
+            foreach (array_intersect($removedDomains, $whitelistBefore) as $removedHost) {
+                $output->writeln($removedHost . ' was removed from the whitelist.' . PHP_EOL);
             }
+
+            return Cli::RETURN_SUCCESS;
+        } catch (InvalidArgumentException $e) {
+            return $this->downloadManager->handleInvalidArgumentException($e, $output);
         } catch (Exception $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
-            if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
-                $output->writeln($e->getTraceAsString());
-            }
-            return Cli::RETURN_FAILURE;
+            return $this->downloadManager->handleException($e, $output);
         }
-
-        return Cli::RETURN_SUCCESS;
     }
 }
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index ce2ff2c7117ab..7627512115711 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -1,16 +1,20 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Downloadable\Helper;
 
+use Exception;
+use InvalidArgumentException;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\File\Mime;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Exception\LocalizedException as CoreException;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\Console\Cli;
 
 /**
  * Downloadable Products Download Helper
@@ -141,7 +145,7 @@ public function __construct(
      * Retrieve Resource file handle (socket, file pointer etc)
      *
      * @return \Magento\Framework\Filesystem\File\ReadInterface
-     * @throws CoreException|\Exception
+     * @throws CoreException|Exception
      */
     protected function _getHandle()
     {
@@ -243,14 +247,14 @@ public function getFilename()
      * @param string $resourceFile
      * @param string $linkType
      * @return $this
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function setResource($resourceFile, $linkType = self::LINK_TYPE_FILE)
     {
         if (self::LINK_TYPE_FILE == $linkType) {
             //check LFI protection
             if ($resourceFile && preg_match('#\.\.[\\\/]#', $resourceFile)) {
-                throw new \InvalidArgumentException(
+                throw new InvalidArgumentException(
                     'Requested file may not include parent directory traversal ("../", "..\\" notation)'
                 );
             }
@@ -304,4 +308,47 @@ public function getContentDisposition($store = null)
             $store
         );
     }
+
+    /**
+     * Handle any exception thrown during command execution
+     *
+     * @param Exception $e
+     * @param OutputInterface $output
+     * @return int
+     */
+    public function handleException(Exception $e, OutputInterface $output): int
+    {
+        $output->writeln('<error>' . $e->getMessage() . '</error>');
+        if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
+            $output->writeln($e->getTraceAsString());
+        }
+        return Cli::RETURN_FAILURE;
+    }
+
+    /**
+     * Validate the input domains array
+     *
+     * @param array $domains
+     * @return void
+     * @throws InvalidArgumentException
+     */
+    public function validateDomains(array $domains): void
+    {
+        if (empty($domains)) {
+            throw new InvalidArgumentException('Error: Domains parameter is missing.');
+        }
+    }
+
+    /**
+     * Handle the \InvalidArgumentException exception.
+     *
+     * @param InvalidArgumentException $e
+     * @param OutputInterface $output
+     * @return int
+     */
+    public function handleInvalidArgumentException(InvalidArgumentException $e, OutputInterface $output): int
+    {
+        $output->writeln('<error>' . $e->getMessage() . '</error>');
+        return Cli::RETURN_FAILURE;
+    }
 }