diff --git a/src/Controller/ScanController.php b/src/Controller/ScanController.php
index 4e9dc8b2..537be473 100644
--- a/src/Controller/ScanController.php
+++ b/src/Controller/ScanController.php
@@ -309,7 +309,9 @@ class ScanController extends AbstractController
 
         $modeEnum = null;
         if ($mode !== '') {
-            $modeEnum = BarcodeSourceType::from((int) $mode);
+            $i = (int) $mode;
+            $cases = BarcodeSourceType::cases();
+            $modeEnum = $cases[$i] ?? null; // null if out of range
         }
 
         try {
diff --git a/src/Services/LabelSystem/BarcodeScanner/LCSCBarcodeScanResult.php b/src/Services/LabelSystem/BarcodeScanner/LCSCBarcodeScanResult.php
index 9a87951f..236bad48 100644
--- a/src/Services/LabelSystem/BarcodeScanner/LCSCBarcodeScanResult.php
+++ b/src/Services/LabelSystem/BarcodeScanner/LCSCBarcodeScanResult.php
@@ -100,7 +100,10 @@ class LCSCBarcodeScanResult implements BarcodeScanResultInterface
         $fields = [];
 
         // This format is comma-separated pairs, values do not contain commas in your sample.
-        $pairs = array_filter(array_map('trim', explode(',', $inner)));
+        $pairs = array_filter(
+            array_map('trim', explode(',', $inner)),
+            static fn(string $s): bool => $s !== ''
+        );
 
         foreach ($pairs as $pair) {
             $pos = strpos($pair, ':');