diff --git a/gulliver/system/class.database_mysql.php b/gulliver/system/class.database_mysql.php
index 0aed74c45..8bf50d0e9 100644
--- a/gulliver/system/class.database_mysql.php
+++ b/gulliver/system/class.database_mysql.php
@@ -382,10 +382,16 @@ class database extends database_base {
       if ( substr($sQuery,0, 4) == 'DESC'   ) $found = true;
       if ( substr($sQuery,0, 4) == 'USE '   ) $found = true;
       if ( ! $found ) {
-      $logFile = PATH_DATA . 'log' . PATH_SEP . 'query.log';
-      $fp = fopen ( $logFile, 'a+' );
-      fwrite ( $fp, date("Y-m-d H:i:s") . " " . $this->sDataBase . " " . $sQuery  . "\n" );
-      fclose ( $fp );
+        $logDir = PATH_DATA . 'log';
+        if (!file_exists($logDir))
+          if (!mkdir($logDir))
+            return;
+        $logFile = "$logDir/query.log";
+        $fp = fopen ( $logFile, 'a+' );
+        if ($fp !== false) {
+          fwrite ( $fp, date("Y-m-d H:i:s") . " " . $this->sDataBase . " " . $sQuery  . "\n" );
+          fclose ( $fp );
+        }
       }
     }
     catch (Exception $oException) { 
diff --git a/workflow/engine/classes/class.languages.php b/workflow/engine/classes/class.languages.php
index 5cd823ffb..6998383d4 100644
--- a/workflow/engine/classes/class.languages.php
+++ b/workflow/engine/classes/class.languages.php
@@ -42,10 +42,16 @@ class languages {
   */
   function log ( $text ) 
   {
-    $logFile = PATH_DATA . 'log' . PATH_SEP . 'query.log';
+    $logDir = PATH_DATA . 'log';
+    if (!file_exists($logDir))
+      if (!mkdir($logDir))
+        return;
+    $logFile = "$logDir/query.log";
     $fp      = fopen ( $logFile, 'a+' );
-    fwrite ( $fp, date("Y-m-d H:i:s") . " " . $text  . "\n" );
-    fclose ( $fp );
+    if ($fp !== false) {
+      fwrite ( $fp, date("Y-m-d H:i:s") . " " . $text  . "\n" );
+      fclose ( $fp );
+    }
   }
   
   /*