diff --git a/VERAGAddIn/ThisAddIn.vb b/VERAGAddIn/ThisAddIn.vb
index 2fae08c..2ce294e 100644
--- a/VERAGAddIn/ThisAddIn.vb
+++ b/VERAGAddIn/ThisAddIn.vb
@@ -179,19 +179,16 @@ Public Class ThisAddIn
 
     Private Sub checkConnection()
 
-
         Dim con = New VERAG_PROG_ALLGEMEIN.SQL
 
-        If con.getValueTxtBySql("SELECT 1", "FMZOLL") <> 1 Then
-            MsgBox("ACHTUNG: Server nicht erreichbar!" & vbCrLf & "VERAG ADD In wird beendet")
-        End If
-
         For Each COMAddIn As COMAddIn In Me.Application.COMAddIns
 
-            '    If (COMAddIn.ProgId.Contains("< ADDIN_PROG_ID >")) Then
-
-            '        COMAddIn.Connect = False
-            '        Exit
+            If COMAddIn.ProgId.Contains("VERAGAddIn") Then
+                If con.getValueTxtBySql("SELECT 1", "FMZOLL") <> 1 Then
+                    MsgBox("ACHTUNG: Server nicht erreichbar!" & vbCrLf & "VERAG ADD In wird beendet")
+                    COMAddIn.Connect = False
+                End If
+            End If
         Next