diff --git a/Classes/TceMain.php b/Classes/TceMain.php
index 6253647..3e8b8bf 100644
--- a/Classes/TceMain.php
+++ b/Classes/TceMain.php
@@ -36,6 +36,10 @@ public function processDatamap_afterDatabaseOperations(
         array $fieldArray,
         DataHandler $parentObject
     ): void {
+        // guard statement, abort here if no ods_osm table
+        if (strpos($table, 'tx_odsosm_') !== 0) {
+            return;
+        }
         /*
          * The id may be integer already or the temporary NEW id. This depends, how the record was created
          *
@@ -55,7 +59,7 @@ public function processDatamap_afterDatabaseOperations(
          */
 
         if ($status == "new") {
-            $id = $parentObject->substNEWwithIDs[$id];
+            $id = $parentObject->substNEWwithIDs[$id] ?? '';
         }
 
         if (!is_int($id)) {