From 968761e7f9caa93fb7c3f6121568db281c77ce41 Mon Sep 17 00:00:00 2001
From: HammadAhmadWaqas <hammadahmadwaqas1@gmail.com>
Date: Tue, 17 Mar 2020 14:31:04 +0500
Subject: [PATCH] better exception handling

---
 .../create_orders_for_old_enterprise_course_enrollment.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/djangoapps/commerce/management/commands/create_orders_for_old_enterprise_course_enrollment.py b/lms/djangoapps/commerce/management/commands/create_orders_for_old_enterprise_course_enrollment.py
index ebf1e47b6f..85a4a2d94c 100644
--- a/lms/djangoapps/commerce/management/commands/create_orders_for_old_enterprise_course_enrollment.py
+++ b/lms/djangoapps/commerce/management/commands/create_orders_for_old_enterprise_course_enrollment.py
@@ -158,14 +158,14 @@ class Command(BaseCommand):
                     "enterprise_customer_name": enterprise_customer.name,
                     "enterprise_customer_uuid": str(enterprise_customer.uuid),
                 }
-            except AttributeError as ex:
-                self.stderr.write(u'\t\tskipping enrollment {} due to invalid data. {}'.format(enrollment.id, ex))
-                invalid += 1
-                continue
             except CourseEnrollment.DoesNotExist:
                 self.stderr.write(u'\t\tskipping enrollment {}, as CourseEnrollment not found'.format(enrollment.id))
                 invalid += 1
                 continue
+            except Exception as ex:  # pylint: disable=broad-except
+                self.stderr.write(u'\t\tskipping enrollment {} due to invalid data. {}'.format(enrollment.id, ex))
+                invalid += 1
+                continue
             enrollments_payload.append(enrollment_payload)
 
         self.stdout.write(u'\t\tFound {count} Paid enrollments to sync'.format(count=len(enrollments_payload)))