diff --git a/Script/CastorScript.py b/Script/CastorScript.py
index 25dffebce01df0fe34bf269df9607f860741df29..2b06dc97cc9355a978f408295acd27b2476151db 100755
--- a/Script/CastorScript.py
+++ b/Script/CastorScript.py
@@ -181,7 +181,7 @@ def main(conf):
     signal.signal(signal.SIGINT, Exit)
 
     ##### Set Oracle Metadata Database connection #####
-    db = 0
+    db = None
     logger.info('Check for connection to Metadata Database') 
     db = checkDB(db,logger,dblogger,parser)
     lastdbconn = time();
@@ -221,7 +221,7 @@ def main(conf):
             except (Exception),ex:
                 logger.error(str(ex))
                 logger.warning('Could not connect to Metadata Database:')
-                db = 0
+                db = None
             
             dbLock.release()
             lastdbconn = time()
@@ -298,7 +298,7 @@ def Exit(signum,frame):
 
 def checkDB(db,logger,dblogger,parser):
     dbFlag = copy.getDBFlag() and delete.getDBFlag()
-    if not dbFlag: db = 0
+    if not dbFlag: db = None
     if not db and conf.connection:
         logger.info('No connection to Metadata Database at the moment: try to create one')
         try:
@@ -306,7 +306,7 @@ def checkDB(db,logger,dblogger,parser):
             logger.info('New connection to Metadata Database created') 
         except (Exception),ex:
             logger.error(str(ex))
-            logger.warning('Could not connect to Metadata Database')
+            logger.error('Could not connect to Metadata Database')
             
             # end try, except
         copy.setDB(db)
diff --git a/Script/CopyThread.py b/Script/CopyThread.py
index 856f113078bfcd06f60bed48eaf13cabcb2c6f70..acdd73d1d827051db929e1dec260c45c658147a7 100755
--- a/Script/CopyThread.py
+++ b/Script/CopyThread.py
@@ -264,8 +264,8 @@ class CopyThread(threading.Thread):
                         self.dbFlag = self.db.Transfer(DataFile, \
                                                        CastorFile, pool)
                         self.dbLock.release()
-                    else:
-                        self.logger.warning('No connection to Metadata database: database will not be updated')
+                    elif self.conf.connection:
+                        self.logger.warning('No connection to Metadata database: database will not be updated for file %s' % DataFile)
                     # end if,else
                     ##### Copy successfull: rename .data.COPYING in .data.COPIED #####
                     os.rename(DataFile + copying_ext,
diff --git a/Script/DeleteThread.py b/Script/DeleteThread.py
index fc0bf5c7a7ad3a354b810e813c23940a3db09399..8878e954d34f250ecb589ce56c69f99787502253 100755
--- a/Script/DeleteThread.py
+++ b/Script/DeleteThread.py
@@ -96,8 +96,8 @@ class DeleteThread(threading.Thread):
             self.dbLock.acquire()
             self.dbFlag = self.db.Deletion(file)
             self.dbLock.release()
-        else:
-            self.logger.warning('No connection to Metadata database: database will not be updated')
+        elif self.conf.connection:
+            self.logger.warning('No connection to Metadata database: database will not be updated for file %s' % file)
             # end if,else
             
             ##### Put .data deleted file in the clear queue #####