diff --git a/server/app/services/resourceService.js b/server/app/services/resourceService.js
index 467e36e18..bb7aed18b 100644
--- a/server/app/services/resourceService.js
+++ b/server/app/services/resourceService.js
@@ -142,6 +142,7 @@ function updateAWSResourceCostsFromCSV(provider, resources, downlaodedCSVPath, u
                 }
 
                 if (('masterDetails.bgId' in resource) && (resource.masterDetails.bgId != null)) {
+                    console.log("BG: " + resource['bgId'])
                     resourceCostEntry.businessGroupId = resource['bgId']
                 }
 
@@ -154,12 +155,15 @@ function updateAWSResourceCostsFromCSV(provider, resources, downlaodedCSVPath, u
                     && (resource.masterDetails.environmentId != null)) {
                     resourceCostEntry.environmentId = resource['environmentId']
                 }
-            } else {
-                resourceCostEntry.businessGroupId = 'Unassigned'
-                resourceCostEntry.projectId = 'Unassigned'
-                resourceCostEntry.environmentId = 'Unassigned'
             }
 
+            resourceCostEntry.businessGroupId
+                = ('businessGroupId' in resourceCostEntry)?resourceCostEntry.businessGroupId:'Unassigned'
+            resourceCostEntry.projectId
+                = ('projectId' in resourceCostEntry)?resourceCostEntry.projectId:'Unassigned'
+            resourceCostEntry.environmentId
+                = ('environmentId' in resourceCostEntry)?resourceCostEntry.environmentId:'Unassigned'
+
             resourceCost.upsertResourceCost(resourceCostEntry, function (err, costEntry) {
                 if (err) {
                     logger.error(err)