diff --git a/GreenshotConfluencePlugin/ConfluencePluginBase.cs b/GreenshotConfluencePlugin/ConfluencePluginBase.cs
index 5951afd05..d90c97acc 100644
--- a/GreenshotConfluencePlugin/ConfluencePluginBase.cs
+++ b/GreenshotConfluencePlugin/ConfluencePluginBase.cs
@@ -66,7 +66,9 @@ namespace GreenshotConfluencePlugin {
 		public virtual void Shutdown() {
 			LOG.Debug("Plugin shutdown.");
 			host.OnImageEditorOpen -= new OnImageEditorOpenHandler(ImageEditorOpened);
-			confluenceConnector.logout();
+			if (confluenceConnector != null) {
+				confluenceConnector.logout();
+			}
 		}
 
 		/// <summary>
diff --git a/GreenshotJiraPlugin/JiraPluginBase.cs b/GreenshotJiraPlugin/JiraPluginBase.cs
index 6d70291da..42b07b81c 100644
--- a/GreenshotJiraPlugin/JiraPluginBase.cs
+++ b/GreenshotJiraPlugin/JiraPluginBase.cs
@@ -67,7 +67,9 @@ namespace GreenshotJiraPlugin {
 		public virtual void Shutdown() {
 			LOG.Debug("Plugin shutdown.");
 			host.OnImageEditorOpen -= new OnImageEditorOpenHandler(ImageEditorOpened);
-			jiraConnector.logout();
+			if (jiraConnector != null) {
+				jiraConnector.logout();
+			}
 		}
 
 		/// <summary>