diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py
index b61f2ae5f..651d16a3d 100644
--- a/openlp/plugins/songs/lib/songbeamerimport.py
+++ b/openlp/plugins/songs/lib/songbeamerimport.py
@@ -90,6 +90,7 @@ class SongBeamerImport(SongImport):
                 len(self.import_source))
             for file in self.import_source:
                 # TODO: check that it is a valid SongBeamer file
+                self.set_defaults()
                 self.current_verse = u''
                 self.current_verse_type = u'V'
                 read_verses = False
@@ -131,7 +132,8 @@ class SongBeamerImport(SongImport):
                 if self.current_verse:
                     self.replace_html_tags()
                     self.add_verse(self.current_verse, self.current_verse_type)
-                self.finish()
+                if self.check_complete():
+                    self.finish()
                 self.import_wizard.incrementProgressBar(u'%s %s...' %
                     (translate('SongsPlugin.SongBeamerImport', 'Importing'),
                     self.file_name))