--- a/components/openstack/neutron/files/evs/migrate/evs-neutron-migration.py	Thu Jun 25 13:27:37 2015 -0700
+++ b/components/openstack/neutron/files/evs/migrate/evs-neutron-migration.py	Tue Jun 30 09:31:21 2015 -0700
@@ -143,7 +143,8 @@
         raise SystemExit(_("Could not retrieve EVS info from EVS Controller"))
     evsinfo = evs_contr.getEVSInfo()
     if not evsinfo:
-        raise SystemExit(_("No data to migrate"))
+        print "No data to migrate"
+        return
 
     config.readfp(open("/etc/neutron/neutron.conf"))
     if config.has_option("database", 'connection'):