diff --git a/dblayeroo.php b/dblayeroo.php
index 755940e..b3633b5 100644
--- a/dblayeroo.php
+++ b/dblayeroo.php
@@ -2630,7 +2630,11 @@ class dblayeroo
   {
     if (! is_array ($values))
       $this->DBException ("Invalid values to normalize : not an array", 406);
-    $values = array_map ("trim", $values);
+    foreach ($values as $key => $val)
+    {
+      if ($val !== null)
+        $values[$key] = trim ($val);
+    }
     return $values;
   }
   // }}}
@@ -3192,7 +3196,7 @@ class dblayeroo
   {
     if (! key_exists ($this->dsn, self::$instance))
       $this->DBException ("Direct query without established connection");
-    return self::$instance[$this->dsn]->query ($sql, PDO::FETCH_ASSOC);
+    return self::$instance[$this->dsn]->query ($sql, \PDO::FETCH_ASSOC);
   }
   /* }}} */