diff --git a/WinLineArtikelnummerGenerator/My Project/Application.myapp b/WinLineArtikelnummerGenerator/My Project/Application.myapp
index 1243847..739ea6f 100644
--- a/WinLineArtikelnummerGenerator/My Project/Application.myapp	
+++ b/WinLineArtikelnummerGenerator/My Project/Application.myapp	
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <MySubMain>true</MySubMain>
-  <MainForm>Form1</MainForm>
+  <MainForm>frmMain</MainForm>
   <SingleInstance>false</SingleInstance>
   <ShutdownMode>0</ShutdownMode>
   <EnableVisualStyles>true</EnableVisualStyles>
   <AuthenticationMode>0</AuthenticationMode>
-  <ApplicationType>0</ApplicationType>
   <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
-</MyApplicationData>
+</MyApplicationData>
\ No newline at end of file
diff --git a/WinLineArtikelnummerGenerator/My Project/AssemblyInfo.vb b/WinLineArtikelnummerGenerator/My Project/AssemblyInfo.vb
index 82e2e70..ec4931f 100644
--- a/WinLineArtikelnummerGenerator/My Project/AssemblyInfo.vb	
+++ b/WinLineArtikelnummerGenerator/My Project/AssemblyInfo.vb	
@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("WinLineProductNumberGenerator")>
-<Assembly: AssemblyCopyright("Copyright © 2020")>
+<Assembly: AssemblyCopyright("Copyright © 2021")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.1.0.7")>
+<Assembly: AssemblyVersion("1.2.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
diff --git a/WinLineArtikelnummerGenerator/My Project/Resources.Designer.vb b/WinLineArtikelnummerGenerator/My Project/Resources.Designer.vb
index 40f473e..c3bbffc 100644
--- a/WinLineArtikelnummerGenerator/My Project/Resources.Designer.vb	
+++ b/WinLineArtikelnummerGenerator/My Project/Resources.Designer.vb	
@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
diff --git a/WinLineArtikelnummerGenerator/My Project/Settings.Designer.vb b/WinLineArtikelnummerGenerator/My Project/Settings.Designer.vb
index 06f00a9..5754384 100644
--- a/WinLineArtikelnummerGenerator/My Project/Settings.Designer.vb	
+++ b/WinLineArtikelnummerGenerator/My Project/Settings.Designer.vb	
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
diff --git a/WinLineArtikelnummerGenerator/My Project/licenses.licx b/WinLineArtikelnummerGenerator/My Project/licenses.licx
index d39415a..8b13789 100644
--- a/WinLineArtikelnummerGenerator/My Project/licenses.licx	
+++ b/WinLineArtikelnummerGenerator/My Project/licenses.licx	
@@ -1,2 +1 @@
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
diff --git a/WinLineArtikelnummerGenerator/Winline.vb b/WinLineArtikelnummerGenerator/Winline.vb
index dc86057..999fb91 100644
--- a/WinLineArtikelnummerGenerator/Winline.vb
+++ b/WinLineArtikelnummerGenerator/Winline.vb
@@ -179,18 +179,33 @@ Public Class Winline
             _Logger.Info("WebService Response: {0}", oXmlResponse)
 
             Dim oDocument As New XmlDocument
-            oDocument.LoadXml(oXmlResponse)
-            oDocument.Save(Console.Out)
+
+            Try
+                oDocument.LoadXml(oXmlResponse)
+                oDocument.Save(Console.Out)
+            Catch ex As Exception
+                _Logger.Error(ex)
+                Return False
+            End Try
 
             Dim oSuccess As XmlNode = oDocument.DocumentElement.SelectSingleNode("OverallSuccess")
+            Dim oInnerSuccess = True
 
             If oSuccess.InnerText.ToUpper = "TRUE" Then
-                For Each oNode As XmlNode In oDocument.DocumentElement.SelectNodes("Success")
+                Dim oSuccessNodes = oDocument.DocumentElement.SelectNodes("//Success")
 
+                For Each oNode As XmlNode In oSuccessNodes
+                    If oNode.InnerText.ToUpper <> "TRUE" Then
+                        oInnerSuccess = False
+                    End If
                 Next
                 _Logger.Info("Request was SUCCESSFUL!")
 
-                Return True
+                If oInnerSuccess = False Then
+                    Return False
+                Else
+                    Return True
+                End If
             Else
                 _Logger.Info("Request FAILED!")
                 Return False
@@ -203,7 +218,7 @@ Public Class Winline
 
     Public Function TestArticleExists(ArticleNumber As String) As Boolean
         Try
-            Dim oResult = _Winline.GetScalarValue($"SELECT c000 FROM v021 WHERE c002 = '{ArticleNumber}'")
+            Dim oResult = _Winline.GetScalarValue($"SELECT c002 FROM v021 WHERE c002 = '{ArticleNumber}'")
 
             If IsNothing(oResult) Or IsDBNull(oResult) Then
                 Return False
@@ -275,8 +290,7 @@ Public Class Winline
         oXmlData &= $"</MESOWebService>"
 
         Try
-            My.Application.Winline.SendWebserviceRequest(oTemplateType, oTemplateName, oXmlData)
-            Return True
+            Return My.Application.Winline.SendWebserviceRequest(oTemplateType, oTemplateName, oXmlData)
         Catch ex As Exception
             _Logger.Error(ex)
             Return False
@@ -301,25 +315,28 @@ Public Class Winline
         oXmlData &= $"</MESOWebService>"
 
         Try
-            My.Application.Winline.SendWebserviceRequest(oTemplateType, oTemplateName, oXmlData)
-            Return True
+            Return My.Application.Winline.SendWebserviceRequest(oTemplateType, oTemplateName, oXmlData)
         Catch ex As Exception
             _Logger.Error(ex)
             Return False
         End Try
     End Function
 
-    Public Sub RunWinlineMacro(MacroName As String, ParamArray Parameters As Object())
+    Public Function RunWinlineMacro(MacroName As String, ParamArray Parameters As Object()) As Boolean
         Try
             Dim oCWLObject
             Dim oParamArray As Object = New Runtime.InteropServices.VariantWrapper(Parameters)
 
             oCWLObject = CreateObject("cwlstart.application")
             oCWLObject.MacroCommands.MRunMacro(MacroName, oParamArray)
+
+            Return True
         Catch ex As Exception
             _Logger.Error(ex)
-            MsgBox($"Das WinLine-Makro [{MacroName}] konnte nicht gestartet werden. Mehr Informationen im Log.", MsgBoxStyle.Critical, "WinLine")
+            _Logger.Warn($"Das WinLine-Makro [{MacroName}] konnte nicht gestartet werden.")
+
+            Return False
         End Try
-    End Sub
+    End Function
 End Class