diff --git a/core/src/main/java/org/jivesoftware/spark/Workspace.java b/core/src/main/java/org/jivesoftware/spark/Workspace.java
index e422b9281..8eadbad3d 100644
--- a/core/src/main/java/org/jivesoftware/spark/Workspace.java
+++ b/core/src/main/java/org/jivesoftware/spark/Workspace.java
@@ -139,10 +139,10 @@ public class Workspace extends JPanel implements StanzaListener {
 	                    // Leave the ChatRoom
 	                    container.leaveChatRoom(chatRoom);
 	                }
-	                conferences.shutdown();
-	                gatewayPlugin.shutdown();
-	                bookmarkPlugin.shutdown();
-	                broadcastPlugin.shutdown();
+                    if (conferences != null) conferences.shutdown();
+                    if (gatewayPlugin != null) gatewayPlugin.shutdown();
+                    if (bookmarkPlugin != null) bookmarkPlugin.shutdown();
+                    if (broadcastPlugin != null) broadcastPlugin.shutdown();
 	            }
 	        }
         );