Merge branch 'MAGETWO-92165' of github.com:magento-qwerty/magento2ce into MAGETWO-92165

Author: mduuude

app/code/Magento/Catalog/Model/Product/Option/Type/File/ExistingValidate.php

@@ -16,17 +16,17 @@ class ExistingValidate extends \Zend_Validate
      *
      * @param string $value File's full path.
      * @param string|null $originalName Original file's name (when uploaded).
-     *
-     * @throws \InvalidArgumentException
      */
     public function isValid($value, string $originalName = null)
     {
+        $this->_messages = [];
+        $this->_errors = [];
+
         if (!is_string($value)) {
-            throw new \InvalidArgumentException('File\'s full path is expected');
+            $this->_messages[] = __('Full file path is expected.')->render();
+            return false;
         }
 
-        $this->_messages = [];
-        $this->_errors = [];
         $result = true;
         $fileInfo = null;
         if ($originalName) {