my ($call, $newline) = split /\s+/, $line, 2;
$call = uc $call;
-my $dxchan = DXChannel->get($call);
+my $dxchan = DXChannel::get($call);
+my $mycall = $self->call;
return (1, $self->msg('e7', $call)) unless $dxchan;
-if ($self->remotecmd) {
+return (1, $self->msg('e31', $call)) unless $dxchan->is_user;
+if ($self->remotecmd || $self->inscript) {
Log('DXCommand', "$mycall is trying to 'demo' to $call remotely");
return (1, $self->msg('e5'));
}