1 files changed, 2 insertions, 3 deletions
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707ArtifactUuidFix.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707ArtifactUuidFix.java
index 6f645dc8dd..d8b2f62705 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707ArtifactUuidFix.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/Migration1707ArtifactUuidFix.java
@@ -147,10 +147,9 @@ public class Migration1707ArtifactUuidFix {
 					vfLst.add(resource);
 					writeModuleResultToFile(writer, resource, null);
 					writer.flush();
-					break;
 				}
+				titanDao.commit();
 			}
-			titanDao.commit();
 
 		} catch (Exception e) {
 			log.info("Failed to fetch vf resources ", e);
@@ -510,7 +509,7 @@ public class Migration1707ArtifactUuidFix {
 			List<GroupDefinition> groupsList = resource.getGroups();
 			if (groupsList != null && artifactsMap != null) {
 				for (GroupDefinition group : groupsList) {
-					if (group.getType().equals(Constants.DEFAULT_GROUP_VF_MODULE)) {
+					if (group.getType().equals(Constants.DEFAULT_GROUP_VF_MODULE) && group.getArtifacts() != null) {
 						log.debug("Migration1707ArtifactUuidFix  fix group:  resource id {}, group name {} ", resource.getUniqueId(), group.getName());
 						List<String> groupArtifacts = new ArrayList<String>(group.getArtifacts());
 						group.getArtifacts().clear();