diff --git a/Config/ConfigManager.vb b/Config/ConfigManager.vb
index 5762d979..6897cd2c 100644
--- a/Config/ConfigManager.vb
+++ b/Config/ConfigManager.vb
@@ -160,6 +160,10 @@ Public Class ConfigManager(Of T)
                 oConfig = _Serializer.Deserialize(oReader)
             End Using
 
+            If oConfig Is Nothing Then
+                oConfig = Activator.CreateInstance(_Blueprint.GetType)
+            End If
+
             Return oConfig
         Catch ex As Exception
             _Logger.Error(ex)
diff --git a/EDMI_ClientSuite/ClassService.vb b/EDMI_ClientSuite/ClassService.vb
index 7c4b39fb..b6214241 100644
--- a/EDMI_ClientSuite/ClassService.vb
+++ b/EDMI_ClientSuite/ClassService.vb
@@ -10,6 +10,7 @@ Public Class ClassService
     Public Enum ConnectionTestResult
         Successful
         NotFound
+        EmptyURI
         Unknown
     End Enum
 
@@ -57,6 +58,9 @@ Public Class ClassService
                                                Catch ex As EndpointNotFoundException
                                                    _Logger.Error(ex)
                                                    Return ConnectionTestResult.NotFound
+                                               Catch ex As UriFormatException
+                                                   _Logger.Error(ex)
+                                                   Return ConnectionTestResult.EmptyURI
                                                Catch ex As Exception
                                                    _Logger.Error(ex)
                                                    Return ConnectionTestResult.Unknown
diff --git a/EDMI_ClientSuite/frmConfigService.Designer.vb b/EDMI_ClientSuite/frmConfigService.Designer.vb
index 632807fe..65a03c15 100644
--- a/EDMI_ClientSuite/frmConfigService.Designer.vb
+++ b/EDMI_ClientSuite/frmConfigService.Designer.vb
@@ -91,7 +91,6 @@ Partial Class frmConfigService
         '
         'btnOK
         '
-        Me.btnOK.DialogResult = System.Windows.Forms.DialogResult.Cancel
         Me.btnOK.Location = New System.Drawing.Point(257, 124)
         Me.btnOK.Name = "btnOK"
         Me.btnOK.Size = New System.Drawing.Size(75, 23)
diff --git a/EDMI_ClientSuite/frmConfigService.vb b/EDMI_ClientSuite/frmConfigService.vb
index dc94000c..c42cc8dd 100644
--- a/EDMI_ClientSuite/frmConfigService.vb
+++ b/EDMI_ClientSuite/frmConfigService.vb
@@ -32,6 +32,8 @@
                 Select Case oResult
                     Case ClassService.ConnectionTestResult.NotFound
                         lblStatus.Text = "Dienst konnte nicht gefunden werden. Bitte überprüfen sie Addresse und Port."
+                    Case ClassService.ConnectionTestResult.EmptyURI
+                        lblStatus.Text = "Bitte tragen Sie eine gültige Dienst Adresse ein."
                     Case Else
                         lblStatus.Text = "Unbekannter Fehler."
                 End Select
@@ -43,6 +45,11 @@
     End Sub
 
     Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
-        DialogResult = DialogResult.OK
+        If My.SystemConfigManager.Config.ServiceConnection <> String.Empty Then
+            DialogResult = DialogResult.OK
+            Close()
+        Else
+            MsgBox("Bitte tragen Sie die Dienst Adresse ein!")
+        End If
     End Sub
 End Class
\ No newline at end of file