diff --git a/phpBB/phpbb/console/command/thumbnail/delete.php b/phpBB/phpbb/console/command/thumbnail/delete.php
index 8b767cbbd8..114969c0d0 100644
--- a/phpBB/phpbb/console/command/thumbnail/delete.php
+++ b/phpBB/phpbb/console/command/thumbnail/delete.php
@@ -132,7 +132,9 @@ class delete extends \phpbb\console\command\command
 				}
 
 				$progress->setMessage($this->language->lang('CLI_THUMBNAIL_DELETED', $row['real_filename'], $row['physical_filename']));
-			} catch (storage_exception $e) {
+			}
+			catch (storage_exception $e)
+			{
 				$return = symfony_command::FAILURE;
 				$progress->setMessage('<error>' . $this->language->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</error>');
 
diff --git a/phpBB/phpbb/console/command/thumbnail/generate.php b/phpBB/phpbb/console/command/thumbnail/generate.php
index 52ae19a9de..c0bda918f4 100644
--- a/phpBB/phpbb/console/command/thumbnail/generate.php
+++ b/phpBB/phpbb/console/command/thumbnail/generate.php
@@ -156,9 +156,6 @@ class generate extends \phpbb\console\command\command
 				{
 					$this->storage->write('thumb_' . $row['physical_filename'], fopen($destination, 'rb'));
 
-					@unlink($source);
-					@unlink($destination);
-
 					$thumbnail_created[] = (int) $row['attach_id'];
 
 					if (count($thumbnail_created) === 250)
@@ -173,6 +170,9 @@ class generate extends \phpbb\console\command\command
 				{
 					$progress->setMessage('<info>' . $this->language->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . '</info>');
 				}
+
+				@unlink($source);
+				@unlink($destination);
 			}
 
 			$progress->advance();