diff --git a/commerce_discount.module b/commerce_discount.module
index 4c2e929..0c0447f 100644
--- a/commerce_discount.module
+++ b/commerce_discount.module
@@ -61,7 +61,10 @@ function commerce_discount_remove_discount_components($price_wrapper) {
   $component_removed = FALSE;
   // Remove price components belonging to order discounts.
   foreach ($data['components'] as $key => $component) {
-    if ($component['name'] != 'discount') {
+    if (!empty($component['price']['data'])) {
+      continue;
+    }
+    if (!isset($component['name']) || $component['name'] != 'discount') {
       continue;
     }
     $discount_name = $component['price']['data']['discount_name'];