diff --git a/Aviso/frmWarenorte.vb b/Aviso/frmWarenorte.vb
index 724fece..7d71336 100644
--- a/Aviso/frmWarenorte.vb
+++ b/Aviso/frmWarenorte.vb
@@ -192,12 +192,7 @@ Public Class frmWarenorte
 
         Dim WarenortNew As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_id").Value)
 
-        If txtWarenort.TextLength > 50 Then
-            lblWarning.Text = "Warenort darf max 50 Zeichen besitzen!"
-            Exit Sub
-        Else
-            lblWarning.Text = ""
-        End If
+        If checkFields() = False Then Exit Sub
 
         WarenortNew.wo_warenort = txtWarenort.Text
         WarenortNew.wo_bezeichnung = txtBezeichnung.Text
@@ -217,12 +212,15 @@ Public Class frmWarenorte
 
 
         WarenortNew.SAVE()
+
         dgvWarenorteNew.GetOrder()
         initDGVWarenort(cbxFirma._value)
         dgvWarenorteNew.SetOrder()
 
 
 
+
+
     End Sub
 
     Private Sub cbxFirma_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxFirma.SelectedValueChanged
@@ -238,7 +236,7 @@ Public Class frmWarenorte
 
 
         If cbxFirma._value = "" Then
-            If ((dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is Nothing Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value = "") And initialSave = False) Then
+            If ((dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is Nothing Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value = "") Or initialSave = True) Then 'And initialSave = False ???
 
                 If setWarning Then
                     lblWarning.Text = "Bitte Firma auswählen!"
@@ -263,4 +261,29 @@ Public Class frmWarenorte
 
     End Function
 
+    Private Function checkFields() As Boolean
+
+        If txtWarenort.TextLength > 50 Then
+            lblWarning.Text = "Warenort darf max 50 Zeichen besitzen!"
+            Return False
+        ElseIf txtBezeichnung.TextLength > 50 Then
+            lblWarning.Text = "Bezeichnung darf max 50 Zeichen besitzen!"
+            Return False
+        ElseIf txtStrasse.TextLength > 60 Then
+            lblWarning.Text = "Strasse darf max 60 Zeichen besitzen!"
+            Return False
+        ElseIf txtOrt.TextLength > 50 Then
+            lblWarning.Text = "Ort darf max 50 Zeichen besitzen!"
+            Return False
+        ElseIf txtKennr.TextLength > 20 Then
+            lblWarning.Text = "Kennnummer darf max 20 Zeichen besitzen!"
+            Return False
+        End If
+
+        lblWarning.Text = ""
+        Return True
+
+
+    End Function
+
 End Class
\ No newline at end of file