--- lib/Grep/Action/Search.pm	2007/02/21 19:10:20	58
+++ lib/Grep/Action/Search.pm	2007/02/21 19:11:06	59
@@ -42,12 +42,15 @@
 sub take_action {
     my $self = shift;
 
-	my $q = $self->argument_value('q') || warn "no q?";
+	my $q = $self->argument_value('q');
 
-	my $coll = Grep::Search->collection( $q );
+	return $self->result->error("Need search query") unless ($q);
 
-	Jifty->log->error('result not collection but ', dump( $coll ))
-		unless ( $coll->isa('Jifty::Collection') );
+	my $coll = Grep::Search->collection( $q ) ||
+		return $self->result->error("No results");
+
+	$self->log->fatal('result not collection but ', dump( $coll ))
+		if ( !$coll || !$coll->isa('Jifty::Collection') );
 
 	my $results = $coll->count;