From f9a31e392d86eb8b365df8887ab1fe7c94212ae3 Mon Sep 17 00:00:00 2001
From: mrploddy <craig.henry@juicymedia.co.uk>
Date: Fri, 22 Mar 2013 11:03:40 +0000
Subject: [PATCH] Update Merge.php

---
 app/code/core/Mage/Core/Model/Layout/Merge.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/core/Mage/Core/Model/Layout/Merge.php b/app/code/core/Mage/Core/Model/Layout/Merge.php
index 3bd70c94b2ce9..2ba4e5819afc6 100644
--- a/app/code/core/Mage/Core/Model/Layout/Merge.php
+++ b/app/code/core/Mage/Core/Model/Layout/Merge.php
@@ -639,7 +639,9 @@ protected function _loadFileLayoutUpdatesXml()
             $fileStr = str_replace($this->_subst['from'], $this->_subst['to'], $fileStr);
             /** @var $fileXml Mage_Core_Model_Layout_Element */
             $fileXml = simplexml_load_string($fileStr, $this->_elementClass);
-            $layoutStr .= $fileXml->innerXml();
+            if ($fileXml){
+                $layoutStr .= $fileXml->innerXml();
+            }
         }
         $layoutStr = '<layouts>' . $layoutStr . '</layouts>';
         $layoutXml = simplexml_load_string($layoutStr, $this->_elementClass);