diff --git a/mozilla/webtools/litmus/process_test.cgi b/mozilla/webtools/litmus/process_test.cgi
index 134143a31f1..8bdcca4409f 100755
--- a/mozilla/webtools/litmus/process_test.cgi
+++ b/mozilla/webtools/litmus/process_test.cgi
@@ -181,10 +181,19 @@ foreach my $curtestid (@tests) {
   }
 
 }
+
+if (! $testcount) {
+  invalidInputError("No results submitted.");
+}
+
+
   
 my $testgroup;
 if ($c->param("testgroup")) {
-  $testgroup = Litmus::DB::Testgroup->retrieve($c->param("testgroup")),
+  $testgroup = Litmus::DB::Testgroup->retrieve($c->param("testgroup"));
+  if (! $product) {
+    $product = $testgroup->product();
+  }
 } 
 
 my $vars;