--- dr/DEFAULT.pm	2005-03-26 13:13:22.000000000 +0000
+++ /tmp/DEFAULT.pm	2005-11-22 19:27:30.000000000 +0000
@@ -456,34 +456,21 @@
     # we have to kludge our kludge, too.... )
     if( !$dbh )
     {
-      FAKE_ERROR:
 	if( !$kludge )
 	{
-	    my @dbd;
-	    @dbd = DBI->available_drivers();
+	    my @dbd = DBI->available_drivers();
 
-	    foreach my $dr (@dbd)
-	    {
-		if ( $dr eq $dbd )
-		{
-		    $kludge =
-		      "Null Error during connect($dbd) (bug in DBI)\n";
-		    last FAKE_ERROR;
-		}
-	    }
-	    $kludge = <<TXT;
+	    $kludge = (grep { $_ eq $dbd } @dbd) ?
+	      "Null Error during connect($dbd) (bug in DBI)\n" :
+		<<TXT;
 connect for $dbd failed: DBD::$dbd not found?
 Available DBD drivers: [ @dbd ]
 TXT
 	}
 
-	# oops, we threw an exception
-	if ( $kludge )
-	{
-	    $engine->{ERRNO} = -1;
-	    $engine->{ERROR} = $kludge;
-	    return undef();
-	}
+	$engine->{ERRNO} = -1;
+	$engine->{ERROR} = $kludge;
+	return undef();
     }
 
     $engine->{DBH} = $dbh;