diff --git a/classes/FileUploader.php b/classes/FileUploader.php
index 741d4d8e8..b0480941f 100755
--- a/classes/FileUploader.php
+++ b/classes/FileUploader.php
@@ -158,6 +158,7 @@ class qqUploadedFileXhr
 				$theme = (Shop::isFeatureActive() ? '-'.$imageType['id_theme'] : '');
 				if (!imageResize($tmpName, $new_path.'-'.stripslashes($imageType['name']).$theme.'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
 					return array('error' => Tools::displayError('An error occurred while copying image:').' '.stripslashes($imageType['name']));
+			}
 		}
 		unlink($tmpName);
 		Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_product));
diff --git a/classes/Link.php b/classes/Link.php
index e17096c6d..6dc70fe07 100644
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -317,8 +317,6 @@ class LinkCore
 				$uri_path = _THEME_PROD_DIR_.$ids.($type ? '-'.$type : '').$theme.'.jpg';
 		}
 		else
-			$uri_path = _THEME_PROD_DIR_.$ids.($type ? '-'.$type : '').'.jpg';
-		}else
 		{
 			// if ids if of the form id_product-id_image, we want to extract the id_image part
 			$split_ids = explode('-', $ids);