diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 9b868c6cd..bbedaaf6b 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -378,9 +378,9 @@ def get_uno_command():
     COMMAND = u'soffice'
     OPTIONS = u'-nologo -norestore -minimized -invisible -nofirststartwizard'
     if UNO_CONNECTION_TYPE == u'pipe':
-      CONNECTION = u'"-accept=pipe,name=openlp_pipe;urp;"'
+        CONNECTION = u'"-accept=pipe,name=openlp_pipe;urp;"'
     else:
-      CONNECTION = u'"-accept=socket,host=localhost,port=2002;urp;"' 
+        CONNECTION = u'"-accept=socket,host=localhost,port=2002;urp;"' 
     return u'%s %s %s' % (COMMAND, OPTIONS, CONNECTION)
 
 def get_uno_instance(resolver):
diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py
index 65e9f35ff..eb00da255 100644
--- a/openlp/plugins/presentations/lib/powerpointcontroller.py
+++ b/openlp/plugins/presentations/lib/powerpointcontroller.py
@@ -147,8 +147,10 @@ class PowerpointDocument(PresentationDocument):
         """
         if self.check_thumbnails():
             return
-        self.presentation.Export(os.path.join(self.get_thumbnail_folder(), ''),
-            'png', 320, 240)
+        for num in range(0, self.presentation.Slides.Count):
+            self.presentation.Slides(num + 1).Export(os.path.join(
+                self.get_thumbnail_folder(), 'slide%d.png' % (num + 1)),
+                'png', 320, 240)
 
     def close_presentation(self):
         """
diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py
index a64cd31dd..fc839195c 100644
--- a/openlp/plugins/presentations/lib/pptviewcontroller.py
+++ b/openlp/plugins/presentations/lib/pptviewcontroller.py
@@ -154,8 +154,9 @@ class PptviewDocument(PresentationDocument):
         being shut down
         """
         log.debug(u'ClosePresentation')
-        self.controller.process.ClosePPT(self.pptid)
-        self.pptid = -1
+        if self.controller.process:
+            self.controller.process.ClosePPT(self.pptid)
+            self.pptid = -1
         self.controller.remove_doc(self)
 
     def is_loaded(self):