diff --git a/openlp/plugins/songs/lib/foilpresenterimport.py b/openlp/plugins/songs/lib/foilpresenterimport.py
index c5dfd5d96..8cd328808 100644
--- a/openlp/plugins/songs/lib/foilpresenterimport.py
+++ b/openlp/plugins/songs/lib/foilpresenterimport.py
@@ -422,7 +422,8 @@ class FoilPresenter(object):
             VerseType.Tags[VerseType.PreChorus]: 1
         }
         for strophe in foilpresenterfolie.strophen.strophe:
-            text = self._child(strophe.text_)
+            text = self._child(strophe.text_) if hasattr(strophe, u'text_') \
+                else u''
             verse_name = self._child(strophe.key)
             children = strophe.getchildren()
             sortnr = False
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 5435d79e8..5f961b2f2 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -220,8 +220,7 @@ class SongMediaItem(MediaManagerItem):
         # Push edits to the service manager to update items
         if self.editItem and self.updateServiceOnEdit and \
             not self.remoteTriggered:
-            item_id = _getIdOfItemToGenerate(self.editItem)
-            item = self.buildServiceItem(item_id)
+            item = self.buildServiceItem(self.editItem)
             self.parent.serviceManager.replaceServiceItem(item)
         self.onRemoteEditClear()
         self.onSearchTextButtonClick()