diff --git a/openlp/core/app.py b/openlp/core/app.py
index ba125de3b..2b1edfd91 100644
--- a/openlp/core/app.py
+++ b/openlp/core/app.py
@@ -73,7 +73,8 @@ class OpenLP(QtWidgets.QApplication):
         """
         self.is_event_loop_active = True
         result = QtWidgets.QApplication.exec()
-        self.server.close_server()
+        if hasattr(self, 'server'):
+            self.server.close_server()
         return result
 
     def run(self, args):
diff --git a/openlp/core/display/render.py b/openlp/core/display/render.py
index f95c26286..c72a8db08 100644
--- a/openlp/core/display/render.py
+++ b/openlp/core/display/render.py
@@ -4,7 +4,7 @@
 ###############################################################################
 # OpenLP - Open Source Lyrics Projection                                      #
 # --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# Copyright (c) 2008-2018 OpenLP Developers                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
diff --git a/openlp/core/display/webengine.py b/openlp/core/display/webengine.py
index 2d5b1defa..39ba7e9bd 100644
--- a/openlp/core/display/webengine.py
+++ b/openlp/core/display/webengine.py
@@ -4,7 +4,7 @@
 ###############################################################################
 # OpenLP - Open Source Lyrics Projection                                      #
 # --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# Copyright (c) 2008-2018 OpenLP Developers                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #
diff --git a/openlp/core/display/window.py b/openlp/core/display/window.py
index 39e5de7dd..2a2c3926c 100644
--- a/openlp/core/display/window.py
+++ b/openlp/core/display/window.py
@@ -4,7 +4,7 @@
 ###############################################################################
 # OpenLP - Open Source Lyrics Projection                                      #
 # --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers                                   #
+# Copyright (c) 2008-2018 OpenLP Developers                                   #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #