diff --git a/Cinteros.Xrm/AutoDeployTool/MainControl.cs b/Cinteros.Xrm/AutoDeployTool/MainControl.cs
index 57da0b9..bc71027 100644
--- a/Cinteros.Xrm/AutoDeployTool/MainControl.cs
+++ b/Cinteros.Xrm/AutoDeployTool/MainControl.cs
@@ -109,7 +109,7 @@ private Guid GetAssemblyId(string fileName)
             query.Criteria.AddCondition("culture", ConditionOperator.Equal, chunks[2]);
             query.Criteria.AddCondition("publickeytoken", ConditionOperator.Equal, chunks[3]);
 
-            var plugin = this.Service.RetrieveMultiple(query).Entities.FirstOrDefault();
+            var plugin = this.Service == null ? null : this.Service.RetrieveMultiple(query).Entities.FirstOrDefault();
 
             if (plugin != null)
             {
@@ -192,7 +192,12 @@ private byte[] ReadFile(string fileName)
 
         private void tsbClose_Click(object sender, EventArgs e)
         {
-            this.Watcher.Changed -= this.Plugin_Changed;
+            // Preparing to dispose watcher
+            if (this.Watcher != null)
+            {
+                this.Watcher.Changed -= this.Plugin_Changed;
+            }
+
             this.CloseTool();
         }