--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/04/24 03:33:51	1.11
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/04/24 11:45:17	1.13
@@ -247,6 +247,7 @@
             },
       ;
       $self->{command_widget}->key_down ($ev);
+      return unless $self->{command_widget};
       $self->{command_widget}->show;
       $self->{command_widget}->focus_in;
    }
@@ -355,6 +356,7 @@
       }
    } elsif ($ev->{sym} == 27) {
       $self->emit ("close");
+      return;
    } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
       $self->{search} .= chr $ev->{unicode};
       $self->update_labels;