diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index ff57ecd56..0ea5f057f 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -569,6 +569,15 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
                 (QtGui.QMessageBox.Ok),
                 QtGui.QMessageBox.Ok)
             return
+        if self.theme.theme_name == u'-1' or self.theme.theme_name == u'None':
+            QtGui.QMessageBox.critical(self,
+                translate('OpenLP.ThemeForm', 'Theme Name Invalid'),
+                translate('OpenLP.ThemeForm',
+                    'Invalid theme name. '
+                    'Please enter one.'),
+                (QtGui.QMessageBox.Ok),
+                QtGui.QMessageBox.Ok)
+            return
         save_from = None
         save_to = None
         if self.theme.background_type == \
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 6e3695149..030f67153 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -125,6 +125,8 @@ class MediaMediaItem(MediaManagerItem):
         service_item.title = unicode(
             translate('MediaPlugin.MediaItem', 'Media'))
         service_item.add_capability(ItemCapabilities.RequiresMedia)
+        # force a nonexistent theme
+        service_item.theme = -1
         frame = u':/media/image_clapperboard.png'
         (path, name) = os.path.split(filename)
         service_item.add_from_command(path, name, frame)
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index a4f78cf95..21de00fce 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -409,7 +409,7 @@ class SongMediaItem(MediaManagerItem):
                 Song.search_title.like(u'%' +
                     item.data_string[u'title'].split(u'@')[0] + u'%'),
                 Song.search_title.asc())
-            author_list = item.data_string[u'authors'].split(u',')
+            author_list = item.data_string[u'authors'].split(u', ')
             editId = 0
             uuid = 0
             if search_results: