diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb
index 6c20a04..ee41ee8 100644
--- a/Aviso/My Project/AssemblyInfo.vb	
+++ b/Aviso/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.9.1.0")>
-<Assembly: AssemblyFileVersion("3.9.1.0")>
+<Assembly: AssemblyVersion("3.9.1.2")>
+<Assembly: AssemblyFileVersion("3.9.1.2")>
diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb
index 988d3e4..2662f5e 100644
--- a/Aviso/frmATEZ_NCTS.vb
+++ b/Aviso/frmATEZ_NCTS.vb
@@ -8,7 +8,7 @@ Imports VERAG_PROG_ALLGEMEIN
 Public Class frmATEZ_NCTS
 
     Dim ART As String = ""
-    Dim FilialenNr As Integer
+    Dim FilialenNr As String = ""
     Dim AbfertigungsNr As Integer
     Dim JAHR As Integer = Now.ToString("yy")
     Public isSTAMMREF As Boolean = False
@@ -244,6 +244,13 @@ Public Class frmATEZ_NCTS
 
     Private Sub frmATEZNCTS_Load(sender As Object, e As EventArgs) Handles MyBase.Load
 
+        If FilialenNr = "" Then
+            MsgBox("Keine Filiale ausgewählt!")
+            Me.Close()
+        End If
+
+        FIRMA_DY = SDL.frmZollanmeldung.getFirma_DY(FilialenNr, Nothing)
+
         Select Case FIRMA_DY
             Case "VERAG" : txtDyMandant.Text = "VERG"
                 txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
@@ -253,6 +260,7 @@ Public Class frmATEZ_NCTS
             Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
         End Select
 
+
         initSeachboxes()
         initAttachment()