diff --git a/CHANGELOG.md b/CHANGELOG.md
index e23d48cd3e..3b1db0a0ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - Fix error message during plugin update
+- Fix few errors messages in debug mode
 
 
 ## [2.10.5] - 2024-02-23
diff --git a/inc/order.class.php b/inc/order.class.php
index 4445331a50..8fe6e708bc 100644
--- a/inc/order.class.php
+++ b/inc/order.class.php
@@ -575,7 +575,7 @@ public function rawSearchOptions()
         ];
 
         $tab[] = [
-            'id'            => 30,
+            'id'            => 31,
             'table'         => self::getTable(),
             'field'         => 'id',
             'name'          => __('ID'),
diff --git a/inc/order_item.class.php b/inc/order_item.class.php
index 00aa828188..be391a043a 100644
--- a/inc/order_item.class.php
+++ b/inc/order_item.class.php
@@ -630,6 +630,10 @@ public function prepareInputForAdd($input)
             unset($input['id']);
             unset($input['withtemplate']);
         } else {
+            if (empty($input["plugin_order_references_id"])) {
+                Session::addMessageAfterRedirect(__("You must select a reference", "order"), false, ERROR);
+                return [];
+            }
             if (
                 $config->isAnalyticNatureDisplayed()
                 && $config->isAnalyticNatureMandatory()
@@ -949,8 +953,12 @@ public function getItems($rand, $data_ref, $plugin_order_orders_id, $numref, $ca
             echo "</td>";
 
            /* type */
-            $item = new $data_ref["itemtype"]();
-            echo "<td align='center'>" . $item->getTypeName() . "</td>";
+            if (!is_null($data_ref["itemtype"]) && class_exists($data_ref["itemtype"])) {
+                $item = new $data_ref["itemtype"]();
+                echo "<td align='center'>" . $item->getTypeName() . "</td>";
+            } else {
+                echo "<td align='center'></td>";
+            }
            /* manufacturer */
             echo "<td align='center'>" . Dropdown::getDropdownName(
                 "glpi_manufacturers",
@@ -2204,6 +2212,10 @@ protected function getManufacturersReference($reference_id)
         /** @var \DBmysql $DB */
         global $DB;
 
+        if (empty($reference_id)) {
+            return '';
+        }
+
         $result = $DB->request([
             'SELECT' => 'manufacturers_reference',
             'FROM'   => 'glpi_plugin_order_references',
@@ -2211,6 +2223,6 @@ protected function getManufacturersReference($reference_id)
         ]);
 
         $data = $result->current();
-        return $data['manufacturers_reference'];
+        return $data['manufacturers_reference'] ?? '';
     }
 }