diff --git a/livesupport/modules/storageServer/var/GreenBox.php b/livesupport/modules/storageServer/var/GreenBox.php
index c8ac59954..69c84fa6e 100644
--- a/livesupport/modules/storageServer/var/GreenBox.php
+++ b/livesupport/modules/storageServer/var/GreenBox.php
@@ -23,7 +23,7 @@
 
 
     Author   : $Author: tomas $
-    Version  : $Revision: 1.51 $
+    Version  : $Revision: 1.52 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/GreenBox.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -35,7 +35,7 @@ require_once "BasicStor.php";
  *  LiveSupport file storage module
  *
  *  @author  $Author: tomas $
- *  @version $Revision: 1.51 $
+ *  @version $Revision: 1.52 $
  *  @see BasicStor
  */
 class GreenBox extends BasicStor{
@@ -100,7 +100,7 @@ class GreenBox extends BasicStor{
         if(($res = $this->_authorize('write', $parid, $sessid)) !== TRUE)
             return $res;
         if(!file_exists($mdataFileLP)){
-            $mdataFileLP = dirname(__FILE__).'/emptyMdata.xml';
+            $mdataFileLP = dirname(__FILE__).'/emptyWebstream.xml';
         }
         $oid = $this->bsPutFile(
             $parid, $fileName, '', $mdataFileLP, $gunid, 'webstream'
diff --git a/livesupport/modules/storageServer/var/MetaData.php b/livesupport/modules/storageServer/var/MetaData.php
index 6edc0cc76..fba9fca0c 100644
--- a/livesupport/modules/storageServer/var/MetaData.php
+++ b/livesupport/modules/storageServer/var/MetaData.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.22 $
+    Version  : $Revision: 1.23 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/MetaData.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -285,7 +285,8 @@ class MetaData{
             $pom = $this->getSubrows($rec['mid']);
             if(PEAR::isError($pom)) return $pom;
             $all[$i]['attrs'] = $pom['attrs'];
-            $atlang = $pom['attrs']['xml:lang'];
+            $atlang = (isset($pom['attrs']['xml:lang']) ?
+                $pom['attrs']['xml:lang'] : NULL);
             // select only matching lang (en is default)
             if(
                 is_null($lang) ||
@@ -328,7 +329,7 @@ class MetaData{
                     if($mid == intval($row['mid'])) $aktual = $row;
                 }
             }
-        }else $aktual = $rows[0];
+        }else $aktual = (isset($rows[0])? $rows[0] : NULL);
         if(!is_null($aktual)){
             $res = $this->setMetadataEl($aktual['mid'], $value);
             if(PEAR::isError($res)) return $res;
diff --git a/livesupport/modules/storageServer/var/emptyWebstream.xml b/livesupport/modules/storageServer/var/emptyWebstream.xml
new file mode 100644
index 000000000..4399d80c0
--- /dev/null
+++ b/livesupport/modules/storageServer/var/emptyWebstream.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<audioClip>
+ <metadata
+   xmlns="http://mdlf.org/livesupport/elements/1.0/"
+   xmlns:ls="http://mdlf.org/livesupport/elements/1.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:dcterms="http://purl.org/dc/terms/"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
+ >
+  <ls:url></ls:url>
+  <dc:title>Empty file</dc:title>
+  <dcterms:extent>00:00:00.000000</dcterms:extent>
+ </metadata>
+</audioClip>