diff --git a/commerce_single_address.checkout_pane.inc b/commerce_single_address.checkout_pane.inc
index 2c7cec4..31dd69c 100644
--- a/commerce_single_address.checkout_pane.inc
+++ b/commerce_single_address.checkout_pane.inc
@@ -55,6 +55,9 @@ function commerce_single_address_pane_checkout_form($form, &$form_state, $checko
 
   // If the associated order field has been set...
   if ($field_name = variable_get('commerce_' . $pane_id . '_field', '')) {
+    if (!field_info_instance('commerce_order', $field_name, $order->type)) {
+      return;
+    }
     $profile = $wrapper->{$field_name}->value();
   }
   else {
@@ -233,6 +236,9 @@ function commerce_single_address_pane_checkout_form_submit($form, &$form_state,
   $wrapper = entity_metadata_wrapper('commerce_order', $order);
 
   if ($field_name = variable_get('commerce_' . $checkout_pane['pane_id'] . '_field', '')) {
+    if (!field_info_instance('commerce_order', $field_name, $order->type)) {
+      return;
+    }
     $wrapper->{$field_name} = $profile;
   }
   else {