diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index 882ec2fd2..6a1c611f5 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -74,8 +74,7 @@ class MessageListener(object):
             return
         if not self.controller.is_loaded():
             self.controller.load_presentation(self.controller.filepath)
-        else:
-            self.controller.start_presentation()
+        self.controller.start_presentation()
         if self.controller.slidenumber > 1:
             self.controller.goto_slide(self.controller.slidenumber)
         
diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py
index 977c9c264..53c6e84d0 100644
--- a/openlp/plugins/presentations/lib/presentationcontroller.py
+++ b/openlp/plugins/presentations/lib/presentationcontroller.py
@@ -198,6 +198,8 @@ class PresentationController(object):
         recent than the powerpoint
         """
         lastimage = self.get_slide_preview_file(self.get_slide_count())
+        if lastimage is None:
+            return False
         if not os.path.isfile(lastimage):
             return False
         imgdate = os.stat(lastimage).st_mtime