From 3d0957760daa57d5c39b22e0e95e0e60e08c8845 Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Wed, 26 Sep 2012 13:14:29 +0000
Subject: [PATCH] // hack following up the previous one (in the same file)

---
 tools/swift/Swift/Message.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/swift/Swift/Message.php b/tools/swift/Swift/Message.php
index 3857ac671..95cb7635a 100644
--- a/tools/swift/Swift/Message.php
+++ b/tools/swift/Swift/Message.php
@@ -692,7 +692,8 @@ class Swift_Message extends Swift_Message_Mime
           break;
       }
     }
-    $this->getReference("parent", $new_branch)->removeChild($tag);
+    if ($this->getReference("parent", $new_branch)->hasChild($tag))
+		$this->getReference("parent", $new_branch)->removeChild($tag);
     $mixed = $this->getReference("parent", $new_branch);//parentRefs[$new_branch];
     $this->setReference("parent", $old_branch, $mixed);//parentRefs[$old_branch] = $mixed;
     switch ($new_branch)