--- uc_product/uc_product.module
+++ (current document)
@@ -403,7 +403,9 @@
  */
 function uc_product_forms($form_id, $args) {
   $forms = array();
-  if ($args[0]->nid) {
+  $types = uc_product_type_names();
+  $product = $args[0];
+  if (isset($types[$product->type])) {
     $forms['uc_product_add_to_cart_form_'. $args[0]->nid] = array('callback' => 'uc_product_add_to_cart_form');
     $forms['uc_catalog_buy_it_now_form_'. $args[0]->nid] = array('callback' => 'uc_catalog_buy_it_now_form');
   }

--- uc_product_kit/uc_product_kit.module
+++ (current document)
@@ -275,18 +275,12 @@
 /**
  * Register an "Add to Cart" form for each product kit.
  * @see uc_product_kit_add_to_cart_form()
- * @see uc_catalog_buy_it_now_form()
  */
 function uc_product_kit_forms($form_id, $args) {
   $forms = array();
-  if (substr($form_id, 0, 31) == 'uc_product_kit_add_to_cart_form' || substr($form_id, 0, 27) == 'uc_product_add_to_cart_form' || substr($form_id, 0, 26) == 'uc_catalog_buy_it_now_form') {
-    $products = db_query("SELECT DISTINCT nid FROM {uc_product_kits} WHERE nid = %d", $args[0]->nid);
-
-    while ($prodrow = db_fetch_object($products)) {
-      $forms['uc_product_kit_add_to_cart_form_'. $prodrow->nid] = array('callback' => 'uc_product_kit_add_to_cart_form');
-      $forms['uc_product_add_to_cart_form_'. $prodrow->nid] = array('callback' => 'uc_product_kit_add_to_cart_form');
-      $forms['uc_catalog_buy_it_now_form_'. $prodrow->nid] = array('callback' => 'uc_product_kit_buy_it_now_form');
-    }
+  $product = $args[0];
+  if ($product->type == 'product_kit') {
+    $forms['uc_product_kit_add_to_cart_form_'. $product->nid] = array('callback' => 'uc_product_kit_add_to_cart_form');
   }
   return $forms;
 }