diff --git a/admin/controller/extension/report/customer_activity.php b/admin/controller/extension/report/customer_activity.php
index 13801971..3ec41c44 100644
--- a/admin/controller/extension/report/customer_activity.php
+++ b/admin/controller/extension/report/customer_activity.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportCustomerActivity extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/customer_activity');
 
diff --git a/admin/controller/extension/report/customer_order.php b/admin/controller/extension/report/customer_order.php
index 040a860e..cef96792 100644
--- a/admin/controller/extension/report/customer_order.php
+++ b/admin/controller/extension/report/customer_order.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportCustomerOrder extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/customer_order');
 
diff --git a/admin/controller/extension/report/customer_reward.php b/admin/controller/extension/report/customer_reward.php
index 3a75d375..d03cd08b 100644
--- a/admin/controller/extension/report/customer_reward.php
+++ b/admin/controller/extension/report/customer_reward.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportCustomerReward extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/customer_reward');
 
diff --git a/admin/controller/extension/report/customer_search.php b/admin/controller/extension/report/customer_search.php
index 6e241c14..39ef12c0 100644
--- a/admin/controller/extension/report/customer_search.php
+++ b/admin/controller/extension/report/customer_search.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportCustomerSearch extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/customer_search');
 
diff --git a/admin/controller/extension/report/customer_transaction.php b/admin/controller/extension/report/customer_transaction.php
index c7a03c24..6357a3c9 100644
--- a/admin/controller/extension/report/customer_transaction.php
+++ b/admin/controller/extension/report/customer_transaction.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportCustomerTransaction extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/customer_transaction');
 
diff --git a/admin/controller/extension/report/marketing.php b/admin/controller/extension/report/marketing.php
index 5cb71be3..8b9348eb 100644
--- a/admin/controller/extension/report/marketing.php
+++ b/admin/controller/extension/report/marketing.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportMarketing extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/marketing');
 
diff --git a/admin/controller/extension/report/product_purchased.php b/admin/controller/extension/report/product_purchased.php
index e60d3efd..7ec4bcc9 100644
--- a/admin/controller/extension/report/product_purchased.php
+++ b/admin/controller/extension/report/product_purchased.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportProductPurchased extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/product_purchased');
 
diff --git a/admin/controller/extension/report/product_viewed.php b/admin/controller/extension/report/product_viewed.php
index f10cd036..2a47a1a1 100644
--- a/admin/controller/extension/report/product_viewed.php
+++ b/admin/controller/extension/report/product_viewed.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportProductViewed extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/product_viewed');
 
diff --git a/admin/controller/extension/report/sale_coupon.php b/admin/controller/extension/report/sale_coupon.php
index 410f0851..aacdbad5 100644
--- a/admin/controller/extension/report/sale_coupon.php
+++ b/admin/controller/extension/report/sale_coupon.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportSaleCoupon extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/sale_coupon');
 
diff --git a/admin/controller/extension/report/sale_order.php b/admin/controller/extension/report/sale_order.php
index 347af790..477fd693 100644
--- a/admin/controller/extension/report/sale_order.php
+++ b/admin/controller/extension/report/sale_order.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportSaleOrder extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/sale_order');
 
diff --git a/admin/controller/extension/report/sale_return.php b/admin/controller/extension/report/sale_return.php
index ca368843..ba64b70e 100644
--- a/admin/controller/extension/report/sale_return.php
+++ b/admin/controller/extension/report/sale_return.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportSaleReturn extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/sale_return');
 
diff --git a/admin/controller/extension/report/sale_shipping.php b/admin/controller/extension/report/sale_shipping.php
index 0fe14d7c..28f3fcae 100644
--- a/admin/controller/extension/report/sale_shipping.php
+++ b/admin/controller/extension/report/sale_shipping.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportSaleShipping extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/sale_shipping');
 
diff --git a/admin/controller/extension/report/sale_tax.php b/admin/controller/extension/report/sale_tax.php
index 7d35fbd9..9191f1c5 100644
--- a/admin/controller/extension/report/sale_tax.php
+++ b/admin/controller/extension/report/sale_tax.php
@@ -1,6 +1,8 @@
 <?php
 
 class ControllerExtensionReportSaleTax extends Controller {
+	private $error = array();
+
 	public function index() {
 		$this->load->language('extension/report/sale_tax');
 
diff --git a/admin/controller/marketplace/modification.php b/admin/controller/marketplace/modification.php
index 63effc50..822bf0d6 100644
--- a/admin/controller/marketplace/modification.php
+++ b/admin/controller/marketplace/modification.php
@@ -149,7 +149,7 @@ public function refresh($data = array()) {
 				$recovery = array();
 
 				// Set the a recovery of the modification code in case we need to use it if an abort attribute is used.
-				if (isset($modification)) {
+				if ($modification) {
 					$recovery = $modification;
 				}
 
diff --git a/catalog/controller/mail/order.php b/catalog/controller/mail/order.php
index 93b9cc48..5c619661 100644
--- a/catalog/controller/mail/order.php
+++ b/catalog/controller/mail/order.php
@@ -37,7 +37,7 @@ public function index(&$route, &$args) {
 
 			// If order status is not 0 then send update text email
 			if ($order_info['order_status_id'] && $order_status_id && $notify) {
-				$this->edit($order_info, $order_status_id, $comment, $notify);
+				$this->edit($order_info, $order_status_id, $comment);
 			}
 		}
 	}