-$to = uc $to if $to;
-$via = uc $via if $via;
-my $call = $via || $to;
-my $clref = Route::get($call); # try an exact call
-my $dxchan = $clref->dxchan if $clref;
-#return (1, $self->msg('e7', $call)) unless $dxchan;
-return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+return (1, $self->msg('e22', $to)) unless is_callsign($to);
+return (1, $self->msg('e28')) unless $self->isregistered || $to eq $main::myalias;
+
+#$via = uc $via if $via;
+#my $call = $via || $to;
+#my $clref = Route::get($call); # try an exact call
+#my $dxchan = $clref->dxchan if $clref;
+#push @out, $self->msg('e7', $call) unless $dxchan;
+
+my $call = $to;