diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index facdb09f4..bb86b3179 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -450,7 +450,8 @@ abstract class ObjectModelCore
 			$this->date_upd = date('Y-m-d H:i:s');
 
 		// Database insertion
-		unset($this->id);
+		if (isset($this->id))
+			unset($this->id);
 		if (!$result = ObjectModel::$db->insert($this->def['table'], $this->getFields(), $null_values))
 			return false;
 
diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php
index fde154c10..cbc80f26e 100644
--- a/controllers/admin/AdminStatusesController.php
+++ b/controllers/admin/AdminStatusesController.php
@@ -36,16 +36,21 @@ class AdminStatusesControllerCore extends AdminController
 		$this->colorOnBackground = false;
 		$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
 		$this->context = Context::getContext();
+		$this->imageType = 'gif';
+		$this->fieldImageSettings = array(
+			'name' => 'icon',
+			'dir' => 'os'
+		);
 		parent::__construct();
 	}
-	
+
 	public function init()
 	{
 		if (Tools::isSubmit('addorder_return_state'))
 			$this->display = 'add';
 		if (Tools::isSubmit('updateorder_return_state'))
 			$this->display = 'edit';
-		
+
 		parent::init();
 	}
 	
@@ -54,11 +59,6 @@ class AdminStatusesControllerCore extends AdminController
 	 */
 	protected function initOrderStatutsList()
 	{
-		$this->imageType = 'gif';
-		$this->fieldImageSettings = array(
-			'name' => 'icon',
-			'dir' => 'os'
-		);
 		$this->addRowAction('edit');
 		$this->addRowAction('delete');