Fix a PHP error being thrown on a Magento error being thrown

Author: mariusjp

app/code/Magento/MediaStorage/Model/File/Storage/File.php

@@ -291,16 +291,16 @@ public function saveFile($file, $overwrite = true)
             && isset($file['content'])
             && !empty($file['content'])
         ) {
-            try {
-                $filename = isset(
-                    $file['directory']
-                ) && !empty($file['directory']) ? $file['directory'] . '/' . $file['filename'] : $file['filename'];
+            $filename = isset(
+                $file['directory']
+            ) && !empty($file['directory']) ? $file['directory'] . '/' . $file['filename'] : $file['filename'];
 
+            try {
                 return $this->_fileUtility->saveFile($filename, $file['content'], $overwrite);
             } catch (\Exception $e) {
                 $this->_logger->critical($e);
                 throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Unable to save file "%1" at "%2"', $file['filename'], $file['directory'])
+                    __('Unable to save file "%1" at "%2"', $file['filename'], $filename)
                 );
             }
         } else {