diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py
index 927fe0d7e..7fc8f708f 100644
--- a/openlp/plugins/songs/forms/authorsform.py
+++ b/openlp/plugins/songs/forms/authorsform.py
@@ -74,11 +74,12 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
             self.FirstNameEdit.setFocus()
             return False
-        if self.LastNameEdit.text() == u'':
+        elif self.LastNameEdit.text() == u'':
             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
-
+        else:
+            return QtGui.QDialog.accept(self)
diff --git a/openlp/plugins/songs/forms/songbookform.py b/openlp/plugins/songs/forms/songbookform.py
index 879bfca3e..78e44cbad 100644
--- a/openlp/plugins/songs/forms/songbookform.py
+++ b/openlp/plugins/songs/forms/songbookform.py
@@ -39,3 +39,13 @@ class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):
         self.NameEdit.setFocus()
         return QtGui.QDialog.exec_(self)
 
+    def accept(self):
+        if self.NameEdit.text() == u'':
+            QtGui.QMessageBox.critical(self,
+                translate(u'SongBookDialog', u'Error'),
+                translate(u'SongBookDialog', u'You need to type in a book name!'),
+                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+            self.NameEdit.setFocus()
+            return False
+        else:
+            return QtGui.QDialog.accept(self)
diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py
index 810bf760f..d86c2f464 100644
--- a/openlp/plugins/songs/forms/topicsform.py
+++ b/openlp/plugins/songs/forms/topicsform.py
@@ -37,3 +37,13 @@ class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
         self.NameEdit.setFocus()
         return QtGui.QDialog.exec_(self)
 
+    def accept(self):
+        if self.NameEdit.text() == u'':
+            QtGui.QMessageBox.critical(self,
+                translate(u'SongBookDialog', u'Error'),
+                translate(u'SongBookDialog', u'You need to type in a topic name!'),
+                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
+            self.NameEdit.setFocus()
+            return False
+        else:
+            return QtGui.QDialog.accept(self)