Index: Kernel/System/CustomerAuth/LDAP.pm
===================================================================
--- Kernel/System/CustomerAuth/LDAP.pm	(revision 7)
+++ Kernel/System/CustomerAuth/LDAP.pm	(working copy)
@@ -100,13 +100,14 @@
     # --
     # ldap connect and bind (maybe with SearchUserDN and SearchUserPw)
     # --
-    my $LDAP = Net::LDAP->new($Self->{Host}) or die "$@";
+    my $LDAP = Net::LDAP->new($Self->{Host})
+		or return my $Fail = "1";
     if (!$LDAP->bind(dn => $Self->{SearchUserDN}, password => $Self->{SearchUserPw})) {
         $Self->{LogObject}->Log(
           Priority => 'error',
           Message => "First bind failed!",
         );
-        return;
+		return;
     }
     # --
     # perform user search
Index: bin/cgi-bin/customer.pl
===================================================================
--- bin/cgi-bin/customer.pl	(revision 28)
+++ bin/cgi-bin/customer.pl	(working copy)
@@ -179,7 +179,13 @@
     # check submited data
     # --
     my $User = $AuthObject->Auth(User => $PostUser, Pw => $PostPw);
-    if ($User) {
+	if ($User && $User == "1") {
+		print $CommonObject{LayoutObject}->CustomerLogin(
+			Title => 'Login',
+			Message => 'An Authentication Server could not be found.  Please try again later.',
+		);
+	}
+    elsif ($User) {
         # --
         # get user data
         # --
@@ -269,7 +275,7 @@
             # show normal login
             # --
             print $CommonObject{LayoutObject}->CustomerLogin(
-                Title => 'Login',          
+                Title => 'Login',
                 Message => 'Login failed! Your username or password was entered incorrectly.',
                 User => $User,
                 %Param,
