diff --git a/mozilla/webtools/bugzilla/request.cgi b/mozilla/webtools/bugzilla/request.cgi
index 445783d4717..f872d1d286a 100755
--- a/mozilla/webtools/bugzilla/request.cgi
+++ b/mozilla/webtools/bugzilla/request.cgi
@@ -170,10 +170,11 @@ sub queue {
                     push(@criteria, "bugs.component_id = $component_id");
                     push(@excluded_columns, 'component') unless $cgi->param('do_union');
                 }
-                else { ThrowCodeError("unknown_component", { component => $cgi->param('component') }) }
+                else { ThrowUserError("component_not_valid", { 'product' => $cgi->param('product'),
+                                                               'name' => $cgi->param('component') }) }
             }
         }
-        else { ThrowCodeError("unknown_product", { product => $cgi->param('product') }) }
+        else { ThrowUserError("product_doesnt_exist", { 'product' => $cgi->param('product') }) }
     }
     
     # Filter results by flag types.
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl
index ae47ed34955..8959437a6e0 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl
@@ -235,14 +235,6 @@
        I could not figure out what you wanted to do.
     [% END %]
 
-  [% ELSIF error == "unknown_component" %]
-    [% title = "Unknown Component" %]
-    There is no component named <em>[% component FILTER html %]</em>.
-
-  [% ELSIF error == "unknown_product" %]
-    [% title = "Unknown Product" %]
-    There is no product named <em>[% product FILTER html %]</em>.
-
   [% ELSE %]
     [% title = "Internal error" %]
     An internal error has occured, but [% terms.Bugzilla %] doesn't know