diff --git a/classes/AdminController.php b/classes/AdminController.php
index 9861ce636..e2ba59697 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -717,8 +717,9 @@ class AdminControllerCore extends Controller
 		$this->_errors = array_unique($this->_errors);
 		if (count($this->_errors) > 0)
 			return;
-
-		return $object;
+		if (isset($object))
+			return $object;
+		return;
 	}
 
 	/**
diff --git a/classes/Attribute.php b/classes/Attribute.php
index ab2eb4eae..8392f60d9 100644
--- a/classes/Attribute.php
+++ b/classes/Attribute.php
@@ -320,9 +320,9 @@ class AttributeCore extends ObjectModel
 
 		// when delete, you must use $use_last_attribute
 		if ($use_last_attribute)
-			$sql .= 'AND `id_attribute` != '.(int)$this->id;
+			$sql .= ' AND `id_attribute` != '.(int)$this->id;
 
-		$sql .= 'ORDER BY `position`';
+		$sql .= ' ORDER BY `position`';
 
 		$result = Db::getInstance()->executeS($sql);