diff --git a/includes/commerce_registration.checkout_pane.inc b/includes/commerce_registration.checkout_pane.inc
index e67d1db..714bca8 100755
--- a/includes/commerce_registration.checkout_pane.inc
+++ b/includes/commerce_registration.checkout_pane.inc
@@ -159,7 +159,8 @@ function commerce_registration_information_checkout_form_validate($form, &$form_
       continue;
     }
     $id = (int) $line_item_wrapper->commerce_product->product_id->value();
-    if (registration_status('commerce_product', $id, TRUE) == 1) {
+    if (commerce_registration_product_has_registration_field($id)
+      && registration_status('commerce_product', $id, TRUE) == 1) {
       $product = $line_item_wrapper->commerce_product;
       $quantity = (int) $line_item_wrapper->quantity->value();
       $emails = array();
@@ -279,7 +280,8 @@ function commerce_registration_information_checkout_form_submit($form, &$form_st
       continue;
     }
     $id = (int) $line_item_wrapper->commerce_product->product_id->value();
-    if (registration_status('commerce_product', $id, TRUE) == 1) {
+    if (commerce_registration_product_has_registration_field($id)
+      && registration_status('commerce_product', $id, TRUE) == 1) {
       $product = $line_item_wrapper->commerce_product;
       $quantity = (int) $line_item_wrapper->quantity->value();
       for ($i = 0; $i < $quantity; $i++) {