diff --git a/modules/return/commerce_return.module b/modules/return/commerce_return.module
index 3268cd8..49afda2 100644
--- a/modules/return/commerce_return.module
+++ b/modules/return/commerce_return.module
@@ -452,6 +452,10 @@ function commerce_return_new_configure_line_items($order) {
   // Keyed by product Id.
   foreach (commerce_return_get_order_returns($order) as $return) {
     foreach (entity_metadata_wrapper('commerce_return', $return)->commerce_return_line_items as $line_item_wrapper) {
+      if (!in_array('commerce_product', array_keys($line_item_wrapper->getPropertyInfo()))) {
+        continue;
+      }
+
       if (isset($delta[$line_item_wrapper->commerce_product->product_id->value()])) {
         $delta[$line_item_wrapper->commerce_product->product_id->value()]['quantity'] -= $line_item_wrapper->quantity->value();
       }