diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py
index cee84aae5..99dfd6d69 100644
--- a/openlp/plugins/songs/forms/editverseform.py
+++ b/openlp/plugins/songs/forms/editverseform.py
@@ -77,7 +77,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
     def setVerse(self, text, verseCount=0, single=False, tag=u'Verse:1'):
         posVerse = 0
         posSub = 0
-        if len(text) == 0:
+        if len(text) == 0 and not single:
             text = u'---[Verse:1]---\n'
         if single:
             id = tag.split(u':')
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index 4d1d39cce..713cd55a8 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -139,7 +139,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             else:
                 QtGui.QMessageBox.critical(
                     self, self.trUtf8('Error'),
-                    self.trUtf8('Couldn\'t add your author!'),
+                    self.trUtf8('Couldn\'t add your author'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onTopicAddButtonClick(self):
@@ -150,7 +150,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             else:
                 QtGui.QMessageBox.critical(
                     self, self.trUtf8('Error'),
-                    self.trUtf8('Couldn\'t add your topic!'),
+                    self.trUtf8('Couldn\'t add your topic'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onBookAddButtonClick(self):
@@ -162,7 +162,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             else:
                 QtGui.QMessageBox.critical(
                     self, self.trUtf8('Error'),
-                    self.trUtf8('Couldn\'t add your book!'),
+                    self.trUtf8('Couldn\'t add your book'),
                     QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onAuthorEditButtonClick(self):
@@ -182,7 +182,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 else:
                     QtGui.QMessageBox.critical(
                         self, self.trUtf8('Error'),
-                        self.trUtf8('Couldn\'t save your author!'),
+                        self.trUtf8('Couldn\'t save your author'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onTopicEditButtonClick(self):
@@ -197,7 +197,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 else:
                     QtGui.QMessageBox.critical(
                         self, self.trUtf8('Error'),
-                        self.trUtf8('Couldn\'t save your topic!'),
+                        self.trUtf8('Couldn\'t save your topic'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onBookEditButtonClick(self):
@@ -214,7 +214,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
                 else:
                     QtGui.QMessageBox.critical(
                         self, self.trUtf8('Error'),
-                        self.trUtf8('Couldn\'t save your book!'),
+                        self.trUtf8('Couldn\'t save your book'),
                         QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
 
     def onAuthorDeleteButtonClick(self):
@@ -227,7 +227,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             self.trUtf8('Delete Author'),
             self.trUtf8('Are you sure you want to delete the selected author?'),
             self.trUtf8('This author can\'t be deleted, they are currently '
-                'assigned to at least one song!'),
+                'assigned to at least one song'),
             self.trUtf8('No author selected!'))
 
     def onTopicDeleteButtonClick(self):
@@ -240,7 +240,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             self.trUtf8('Delete Topic'),
             self.trUtf8('Are you sure you want to delete the selected topic?'),
             self.trUtf8('This topic can\'t be deleted, it is currently '
-                'assigned to at least one song!'),
+                'assigned to at least one song'),
             self.trUtf8('No topic selected!'))
 
     def onBookDeleteButtonClick(self):
@@ -253,5 +253,5 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
             self.trUtf8('Delete Book'),
             self.trUtf8('Are you sure you want to delete the selected book?'),
             self.trUtf8('This book can\'t be deleted, it is currently '
-                'assigned to at least one song!'),
-            self.trUtf8('No book selected!'))
\ No newline at end of file
+                'assigned to at least one song'),
+            self.trUtf8('No book selected!'))