diff --git a/DataStorage/Database/Mapper/ReadMapper.php b/DataStorage/Database/Mapper/ReadMapper.php
index cbf5a4f0c..69a17d03d 100755
--- a/DataStorage/Database/Mapper/ReadMapper.php
+++ b/DataStorage/Database/Mapper/ReadMapper.php
@@ -235,8 +235,13 @@ final class ReadMapper extends DataMapperAbstract
         } catch (\Throwable $t) {
             $results = false;
 
-            $q = $query->toSql(); // @debug
-            $m = $t->getMessage(); // @debug
+            \phpOMS\Log\FileLogger::getInstance()->error(
+                \phpOMS\Log\FileLogger::MSG_FULL, [
+                    'message' => $t->getMessage() . ':' . $query->toSql(),
+                    'line'    => __LINE__,
+                    'file'    => self::class,
+                ]
+            );
         }
 
         return $results === false ? [] : $results;
diff --git a/DataStorage/Database/Mapper/UpdateMapper.php b/DataStorage/Database/Mapper/UpdateMapper.php
index 47f87896b..b6f52e776 100755
--- a/DataStorage/Database/Mapper/UpdateMapper.php
+++ b/DataStorage/Database/Mapper/UpdateMapper.php
@@ -154,14 +154,19 @@ final class UpdateMapper extends DataMapperAbstract
             // @todo:
             // @bug: Sqlite doesn't allow table_name.column_name in set queries for whatver reason.
 
-            $sth = $this->db->con->prepare($a = $query->toSql());
+            $sth = $this->db->con->prepare($query->toSql());
             if ($sth !== false) {
                 $sth->execute();
             }
         } catch (\Throwable $t) {
             // @codeCoverageIgnoreStart
-            echo $t->getMessage();
-            echo $query->toSql();
+            \phpOMS\Log\FileLogger::getInstance()->error(
+                \phpOMS\Log\FileLogger::MSG_FULL, [
+                    'message' => $t->getMessage() . ':' . $query->toSql(),
+                    'line'    => __LINE__,
+                    'file'    => self::class,
+                ]
+            );
             // @codeCoverageIgnoreEnd
         }
     }
diff --git a/DataStorage/Database/Mapper/WriteMapper.php b/DataStorage/Database/Mapper/WriteMapper.php
index 39bec061c..1ba0cf92a 100755
--- a/DataStorage/Database/Mapper/WriteMapper.php
+++ b/DataStorage/Database/Mapper/WriteMapper.php
@@ -160,7 +160,7 @@ final class WriteMapper extends DataMapperAbstract
                 $query->insert($this->mapper::PRIMARYFIELD)->value(0);
             }
 
-            $sth = $this->db->con->prepare($a = $query->toSql());
+            $sth = $this->db->con->prepare($query->toSql());
             $sth->execute();
 
             $objId = empty($id = $this->mapper::getObjectId($obj)) ? $this->db->con->lastInsertId() : $id;
@@ -169,9 +169,13 @@ final class WriteMapper extends DataMapperAbstract
             return $objId;
         } catch (\Throwable $t) {
             // @codeCoverageIgnoreStart
-            $a = $t->getMessage(); // @debug
-            $b = $query->toSql(); // @debug
-            $c = \debug_backtrace(); // @debug
+            \phpOMS\Log\FileLogger::getInstance()->error(
+                \phpOMS\Log\FileLogger::MSG_FULL, [
+                    'message' => $t->getMessage() . ':' . $query->toSql(),
+                    'line'    => __LINE__,
+                    'file'    => self::class,
+                ]
+            );
 
             return -1;
             // @codeCoverageIgnoreEND
@@ -385,9 +389,13 @@ final class WriteMapper extends DataMapperAbstract
             }
         } catch (\Throwable $t) {
             // @codeCoverageIgnoreStart
-            $a = $t->getMessage(); // @debug
-            $b = $relQuery->toSql(); // @debug
-            $c = \debug_backtrace(); // @debug
+            \phpOMS\Log\FileLogger::getInstance()->error(
+                \phpOMS\Log\FileLogger::MSG_FULL, [
+                    'message' => $t->getMessage() . ':' . $relQuery->toSql(),
+                    'line'    => __LINE__,
+                    'file'    => self::class,
+                ]
+            );
             // @codeCoverageIgnoreEnd
         }
     }
diff --git a/DataStorage/Database/Query/Builder.php b/DataStorage/Database/Query/Builder.php
index 28d492e09..482cbfa6c 100755
--- a/DataStorage/Database/Query/Builder.php
+++ b/DataStorage/Database/Query/Builder.php
@@ -1397,8 +1397,13 @@ class Builder extends BuilderAbstract
             $sth->execute();
         } catch (\Throwable $t) {
             // @codeCoverageIgnoreStart
-            \var_dump($t->getMessage());
-            \var_dump($this->toSql());
+            \phpOMS\Log\FileLogger::getInstance()->error(
+                \phpOMS\Log\FileLogger::MSG_FULL, [
+                    'message' => $t->getMessage() . ':' . $this->toSql(),
+                    'line'    => __LINE__,
+                    'file'    => self::class,
+                ]
+            );
 
             $sth = null;
             // @codeCoverageIgnoreEnd