diff --git a/livesupport/modules/storageServer/var/StoredFile.php b/livesupport/modules/storageServer/var/StoredFile.php
index 14a07d672..ceb8d81ee 100644
--- a/livesupport/modules/storageServer/var/StoredFile.php
+++ b/livesupport/modules/storageServer/var/StoredFile.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.24 $
+    Version  : $Revision: 1.25 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/StoredFile.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -103,18 +103,21 @@ class StoredFile{
         ");
         if(PEAR::isError($res)){ $ac->dbc->query("ROLLBACK"); return $res; }
         // --- metadata insert:
-        if($metadata != ''){
-            if($mdataLoc=='file' && !file_exists($metadata))
-            {
-                return PEAR::raiseError("StoredFile::insert: ".
-                    "metadata file not found ($metadata)");
-            }
-            $res = $ac->md->insert($metadata, $mdataLoc, $ftype);
-            if(PEAR::isError($res)){
-                $ac->dbc->query("ROLLBACK"); return $res;
-            }
+        if(is_null($metadata) || $metadata == ''){
+            $metadata = dirname(__FILE__).'/emptyMdata.xml';
+            $mdataLoc = 'file';
+        }else{
             $emptyState = FALSE;
         }
+        if($mdataLoc=='file' && !file_exists($metadata))
+        {
+            return PEAR::raiseError("StoredFile::insert: ".
+                "metadata file not found ($metadata)");
+        }
+        $res = $ac->md->insert($metadata, $mdataLoc, $ftype);
+        if(PEAR::isError($res)){
+            $ac->dbc->query("ROLLBACK"); return $res;
+        }
         // --- media file insert:
         if($mediaFileLP != ''){
             if(!file_exists($mediaFileLP))