diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py
index f462b102b..de31083f0 100644
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@@ -180,10 +180,10 @@ class EasyWorshipSongImport(SongImport):
                         self.addAuthor(author_name.strip())
                 if words:
                     # Format the lyrics
-                    words = strip_rtf(words, self.encoding)
-                    if words is None:
+                    result = strip_rtf(words, self.encoding)
+                    if result is None:
                         return
-                    words, self.encoding = words
+                    words, self.encoding = result
                     verse_type = VerseType.Tags[VerseType.Verse]
                     for verse in SLIDE_BREAK_REGEX.split(words):
                         verse = verse.strip()
diff --git a/openlp/plugins/songs/lib/songproimport.py b/openlp/plugins/songs/lib/songproimport.py
index 928ce85ec..3a007ef33 100644
--- a/openlp/plugins/songs/lib/songproimport.py
+++ b/openlp/plugins/songs/lib/songproimport.py
@@ -109,10 +109,10 @@ class SongProImport(SongImport):
             self.finish()
             return
         if u'rtf1' in text:
-            text = strip_rtf(text, self.encoding)
-            if text is None:
+            result = strip_rtf(text, self.encoding)
+            if result is None:
                 return
-            text, self.encoding = text
+            text, self.encoding = result
             text = text.rstrip()
         if not text:
             return
diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py
index c514d4014..9af6099e0 100644
--- a/openlp/plugins/songs/lib/sundayplusimport.py
+++ b/openlp/plugins/songs/lib/sundayplusimport.py
@@ -150,10 +150,10 @@ class SundayPlusImport(SongImport):
                             verse_type = HOTKEY_TO_VERSE_TYPE[value]
                     if name == 'rtf':
                         value = self.unescape(value)
-                        verse = strip_rtf(value, self.encoding)
-                        if verse is None:
+                        result = strip_rtf(value, self.encoding)
+                        if result is None:
                             return
-                        verse, self.encoding = verse
+                        verse, self.encoding = result
                         lines = verse.strip().split('\n')
                         # If any line inside any verse contains CCLI or
                         # only Public Domain, we treat this as special data: