--- a/shelldap	Sat Mar 05 19:41:07 2011 +0100
+++ b/shelldap	Tue Sep 06 15:59:10 2011 -0700
@@ -624,9 +624,9 @@
 		$conf->{'basedn'} = $namingContexts[0];
 		$self->{'base'}   = $namingContexts[0];
 	}
-	if ( @_ ) {
-		my $base = canonical_dn($_[0], casefold => 'none');
-		$self->{'base'} = $base  if ($base);
+	if ( $_[0] ) {
+		my $base = canonical_dn( $_[0], casefold => 'none' );
+		$self->{'base'} = $base if $base;
 	}
 	return $self->{'base'};
 }