diff --git a/core/php/AbeilleCmd.php b/core/php/AbeilleCmd.php
index a9a50422b4..67129638a0 100644
--- a/core/php/AbeilleCmd.php
+++ b/core/php/AbeilleCmd.php
@@ -377,12 +377,12 @@ function signalHandler($signal) {
     $GLOBALS['zigates'] = [];
     $GLOBALS['lastSqn'] = 1;
     $eqLogics = eqLogic::byType('Abeille');
-    cmdLog('debug', "TOTO config=".json_encode($config, JSON_UNESCAPED_SLASHES));
     foreach ($eqLogics as $eqLogic) {
         $eqLogicId = $eqLogic->getLogicalId();
         list($net, $addr) = explode("/", $eqLogicId);
         $gtwId = substr($net, 7); // 'AbeilleX' => 'X'
-        cmdLog('debug', "TOTO ${eqLogicId} gtwId=${gtwId}");
+        if ($gtwId == '')
+            continue; // Incorrect case
 
         if ($config['ab::gtwType'.$gtwId] != 'zigate')
             continue; // Not a Zigate network
diff --git a/core/php/AbeilleParser.php b/core/php/AbeilleParser.php
index 9f007a8b34..d63c34fc36 100644
--- a/core/php/AbeilleParser.php
+++ b/core/php/AbeilleParser.php
@@ -507,6 +507,8 @@ function signalHandler($signal) {
             $eqLogicId = $eqLogic->getLogicalId();
             list($net, $addr) = explode("/", $eqLogicId);
             $gtwId = substr($net, 7); // 'AbeilleX' => 'X'
+            if ($gtwId == '')
+                continue; // Incorrect case
 
             if ($config['ab::gtwType'.$gtwId] != 'zigate')
                 continue; // Not a Zigate network