diff --git a/commerce_webform.module b/commerce_webform.module
index 0d3e498..8c686ce 100644
--- a/commerce_webform.module
+++ b/commerce_webform.module
@@ -335,7 +335,7 @@ function commerce_webform_update_webform_submission_productfield($webform_submis
           // which was just purchased.
           foreach ($webform_submission->data[$key]['value'] as $value_key => $value) {
             $value = json_decode($value);
-            if ($value->product_id == $product_id) {
+            if (!empty($value->product_id) && $value->product_id == $product_id) {
               $value->order_id = $order_id;
               $value->line_item_id = $line_item_id;
               $value->paid = $paid;
diff --git a/productfield.inc b/productfield.inc
index be669fd..95444a3 100644
--- a/productfield.inc
+++ b/productfield.inc
@@ -413,22 +413,25 @@ function theme_webform_display_productfield($variables) {
   $options = $element['#options'];
 
   $items = array();
+
   foreach ($element['#value'] as $value) {
     $value = json_decode($value);
     // Administer provided values.
-    if (isset($options[$value->product_id])) {
-      $paid_display_option = empty($value->paid) ? t('Unpaid') : t('Paid');
-      $paid_display_option = empty($value->order_id) ? $paid_display_option : l($paid_display_option, "admin/commerce/orders/{$value->order_id}/view");
-      $name = _webform_filter_xss($options[$value->product_id]);
-      $items[] = "{$value->quantity} x {$name} (<strong>{$paid_display_option}</strong>)";
-    }
-    else {
-      $items[] = check_plain($value->product_id);
+    if (!empty($value->product_id)) {
+      if (isset($options[$value->product_id])) {
+        $paid_display_option = empty($value->paid) ? t('Unpaid') : t('Paid');
+        $paid_display_option = empty($value->order_id) ? $paid_display_option : l($paid_display_option, "admin/commerce/orders/{$value->order_id}/view");
+        $name = _webform_filter_xss($options[$value->product_id]);
+        $items[] = "{$value->quantity} x {$name} (<strong>{$paid_display_option}</strong>)";
+      }
+      else {
+        $items[] = check_plain($value->product_id);
+      }
     }
   }
 
   if ($element['#format'] == 'html') {
-    $output = count($items) > 1 ? theme('item_list', array('items' => $items)) : (isset($items[0]) ? $items[0] : ' ');
+    $output = count($items) > 1 ? theme('item_list', array('items' => $items)) : (isset($items[0]) ? $items[0] : t('Not selected'));
   }
   else {
     if (count($items) > 1) {
@@ -438,7 +441,7 @@ function theme_webform_display_productfield($variables) {
       $output = implode("\n", $items);
     }
     else {
-      $output = isset($items[0]) ? $items[0] : ' ';
+      $output = isset($items[0]) ? $items[0] : t('Not selected');
     }
   }
 
