killbill-aplcache

diff --git a/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java b/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java
index 35b6dac..9f4d4d1 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/plugin/StandaloneCatalogMapper.java
@@ -111,19 +111,16 @@ public class StandaloneCatalogMapper {
         result.setUnits(toDefaultUnits(pluginCatalog.getUnits()));
         result.setPlanRules(toDefaultPlanRules(pluginCatalog.getPlanRules()));
         for (final Product cur : pluginCatalog.getProducts()) {
-            for (Product target :  result.getCurrentProducts()) {
-                if (target.getName().equals(cur.getName())) {
-                    ((DefaultProduct) target).setAvailable(toFilteredDefaultProduct(cur.getAvailable()));
-                    ((DefaultProduct) target).setIncluded(toFilteredDefaultProduct(cur.getIncluded()));
-                    break;
-                }
+            final Product target = result.getCatalogEntityCollectionProduct().findByName(cur.getName());
+            if (target != null) {
+                ((DefaultProduct) target).setAvailable(toFilteredDefaultProduct(cur.getAvailable()));
+                ((DefaultProduct) target).setIncluded(toFilteredDefaultProduct(cur.getIncluded()));
             }
         }
         result.initialize(result, catalogURI);
         return result;
     }
 
-
     private DefaultPlanRules toDefaultPlanRules(final PlanRules input) {
         final DefaultPlanRules result = new DefaultPlanRules();
         result.setBillingAlignmentCase(toDefaultCaseBillingAlignments(input.getCaseBillingAlignment()));