diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
index 460b3cb7..ad9e20c3 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
@@ -590,10 +590,6 @@ Public Class cCreditSafeAPI
         'Next
 
 
-
-
-
-
         If dtEvents.Rows.Count > 1 Then
             dtEvents.DefaultView.Sort = "eventDate ASC"
             dtEvents = dtEvents.DefaultView.ToTable
@@ -609,6 +605,7 @@ Public Class cCreditSafeAPI
                 Dim ADR As New cAdressen(KUNDE.KundenNr)
                 Dim riskClass As String = ""
                 Dim riskClassChanged As Boolean = False
+                Dim KUNDE_ERW As New cKundenErweitert(KUNDE.KundenNr)
 
                 If Not (ADR.LandKz = "AT" Or ADR.LandKz = "A") Then 'bei nicht österr. den Index nehmen, sonst den Score
                     Index = IIf(CR = defaultCL, -1, calculatedBonIndexFromBonScore(CR, riskClass))
@@ -617,15 +614,15 @@ Public Class cCreditSafeAPI
                 End If
 
                 If Index <> -1 Then
-                    If KUNDE.Bonität <> Index Then
-                        KUNDE.Bonität = Index
-                        riskClassChanged = True
+                    If KUNDE_ERW.kde_CreditSaveBonitaetsIndex <> Index Then
+                        KUNDE_ERW.kde_CreditSaveBonitaetsIndex = Index
+                        KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass
                         KUNDE.Bonitätsdatum = CDate(CR_Datum)
                     End If
                 Else
-                    If KUNDE.Bonität <> CR AndAlso CR <> defaultCR Then
-                        KUNDE.Bonität = CR
-                        riskClassChanged = True
+                    If KUNDE_ERW.kde_CreditSaveBonitaetsScore <> CR AndAlso CR <> defaultCR Then
+                        KUNDE_ERW.kde_CreditSaveBonitaetsScore = CR
+                        KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass
                         KUNDE.Bonitätsdatum = CDate(CR_Datum)
                     End If
                 End If
@@ -637,21 +634,13 @@ Public Class cCreditSafeAPI
                     End If
                 End If
 
-
-
-                If riskClassChanged Then
-                    Dim KUNDE_ERW As New cKundenErweitert(KUNDE.KundenNr)
-                    KUNDE_ERW.kde_CreditSaveBonitaetsklasse = riskClass
-                    KUNDE_ERW.SAVE()
+                KUNDE_ERW.SAVE()
                 End If
 
                 KUNDE.SAVE()
 
             End If
 
-        End If
-
-
 
         Return "Anzahl gefundener Datensätze: " & numCompanies
 
@@ -1019,7 +1008,9 @@ Public Class cCreditSafeAPI
 
     End Function
 
-    Shared Function calculatedBonIndexFromBonScore(score As Integer, ByRef riskClass As String) As Double
+    Shared Function calculatedBonIndexFromBonScore(score As Object, ByRef riskClass As String) As Double
+
+        If score Is Nothing OrElse score = "" OrElse Not IsNumeric(score) Then Return -1
 
         Select Case score
             Case 91 To 100