diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py
index 0ce8b6d75..dd79b8169 100644
--- a/openlp/plugins/songs/forms/authorsform.py
+++ b/openlp/plugins/songs/forms/authorsform.py
@@ -18,7 +18,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 """
 from PyQt4 import QtGui, QtCore
 from openlp.core.lib import translate
-from authorsdialog import Ui_AuthorsDialog
+from openlp.plugins.songs.forms.authorsdialog import Ui_AuthorsDialog
 
 class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
     """
@@ -67,21 +67,21 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
         self.autoDisplayName = on
 
     def accept(self):
-        if self.FirstNameEdit.text() == u'':
+        if not self.FirstNameEdit.text():
             QtGui.QMessageBox.critical(self,
                 translate(u'AuthorsDialog', u'Error'),
                 translate(u'AuthorsDialog', u'You need to type in the first name of the author.'),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
             self.FirstNameEdit.setFocus()
             return False
-        elif self.LastNameEdit.text() == u'':
+        elif not self.LastNameEdit.text():
             QtGui.QMessageBox.critical(self,
                 translate(u'AuthorsDialog', u'Error'),
                 translate(u'AuthorsDialog', u'You need to type in the last name of the author.'),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
             self.LastNameEdit.setFocus()
             return False
-        elif self.DisplayEdit.text() == u'':
+        elif not self.DisplayEdit.text():
             if QtGui.QMessageBox.critical(self,
                     translate(u'AuthorsDialog', u'Error'),
                     translate(u'AuthorsDialog', u'You haven\'t set a display name for the author, would you like me to combine the first and last names for you?'),
diff --git a/openlp/plugins/songs/forms/songbookform.py b/openlp/plugins/songs/forms/songbookform.py
index d104d6749..f273301cc 100644
--- a/openlp/plugins/songs/forms/songbookform.py
+++ b/openlp/plugins/songs/forms/songbookform.py
@@ -19,7 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 
 from PyQt4 import QtGui, QtCore
 from openlp.core.lib import translate
-from songbookdialog import Ui_SongBookDialog
+from openlp.plugins.songs.forms.songbookdialog import Ui_SongBookDialog
 
 class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):
     """
@@ -40,7 +40,7 @@ class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):
         return QtGui.QDialog.exec_(self)
 
     def accept(self):
-        if self.NameEdit.text() == u'':
+        if not self.NameEdit.text():
             QtGui.QMessageBox.critical(self,
                 translate(u'SongBookDialog', u'Error'),
                 translate(u'SongBookDialog', u'You need to type in a book name!'),
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index edf9af332..a319358cd 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -79,15 +79,15 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
         item_id = self._getCurrentItemId(list_widget)
         if item_id != -1:
             item = get_func(item_id)
-            if QtGui.QMessageBox.warning(self, dlg_title, del_text,
-                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)
-                    ) == QtGui.QMessageBox.Yes:
-                if item is not None and len(item.songs) == 0:
+            if item is not None and len(item.songs) == 0:
+                if QtGui.QMessageBox.warning(self, dlg_title, del_text,
+                        QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)
+                        ) == QtGui.QMessageBox.Yes:
                     del_func(item.id)
                     reset_func()
-                else:
-                    QtGui.QMessageBox.critical(self, dlg_title, err_text,
-                        QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+            else:
+                QtGui.QMessageBox.critical(self, dlg_title, err_text,
+                    QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
         else:
             QtGui.QMessageBox.critical(self, dlg_title, sel_text,
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py
index 073abeb5e..95f18f6a3 100644
--- a/openlp/plugins/songs/forms/topicsform.py
+++ b/openlp/plugins/songs/forms/topicsform.py
@@ -18,7 +18,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 """
 from PyQt4 import QtGui, QtCore
 from openlp.core.lib import translate
-from topicsdialog import Ui_TopicsDialog
+from openlp.plugins.songs.forms.topicsdialog import Ui_TopicsDialog
 
 class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
     """
@@ -38,7 +38,7 @@ class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
         return QtGui.QDialog.exec_(self)
 
     def accept(self):
-        if self.NameEdit.text() == u'':
+        if not self.NameEdit.text():
             QtGui.QMessageBox.critical(self,
                 translate(u'SongBookDialog', u'Error'),
                 translate(u'SongBookDialog', u'You need to type in a topic name!'),