diff --git a/openlp/plugins/songs/forms/__init__.py b/openlp/plugins/songs/forms/__init__.py
index d6aef47dc..588f359f6 100644
--- a/openlp/plugins/songs/forms/__init__.py
+++ b/openlp/plugins/songs/forms/__init__.py
@@ -52,4 +52,4 @@ This allows OpenLP to use ``self.object`` for all the GUI elements while keeping
 them separate from the functionality, so that it is easier to recreate the GUI
 from the .ui files later if necessary.
 """
-from editsongform import EditSongForm
\ No newline at end of file
+from editsongform import EditSongForm
diff --git a/tests/functional/openlp_plugins/songs/test_mediaitem.py b/tests/functional/openlp_plugins/songs/test_mediaitem.py
index 5f5c161eb..a0f81bde8 100644
--- a/tests/functional/openlp_plugins/songs/test_mediaitem.py
+++ b/tests/functional/openlp_plugins/songs/test_mediaitem.py
@@ -26,7 +26,7 @@ class TestMediaItem(TestCase):
         Registry().register(u'service_list', MagicMock())
 
         with patch('openlp.core.lib.mediamanageritem.MediaManagerItem.__init__'), \
-             patch('openlp.plugins.songs.forms.editsongform.EditSongForm.__init__') :
+             patch('openlp.plugins.songs.forms.editsongform.EditSongForm.__init__'):
             self.media_item = SongMediaItem(MagicMock(), MagicMock())
 
         fd, self.ini_file = mkstemp(u'.ini')
@@ -42,7 +42,7 @@ class TestMediaItem(TestCase):
         try:
             os.unlink(self.ini_file)
             os.unlink(Settings().fileName())
-        except:
+        except Exception:
             pass
 
     def build_song_footer_one_author_test(self):
@@ -122,4 +122,4 @@ class TestMediaItem(TestCase):
 
         # THEN: I would get an amended footer string
         self.assertEqual(service_item.raw_footer, [u'My Song', u'my author', u'My copyright', u'CCLI License: 4321'],
-                         u'The array should be returned correctly with a song, an author, copyright and amended ccli')
\ No newline at end of file
+                         u'The array should be returned correctly with a song, an author, copyright and amended ccli')