diff --git a/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java b/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java
index b9a1b65..9d9cfea 100644
--- a/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java
+++ b/catalog/src/main/java/org/killbill/billing/catalog/VersionedCatalog.java
@@ -151,7 +151,8 @@ public class VersionedCatalog extends ValidatingConfig<StandaloneCatalog> implem
if (e.getCode() != ErrorCode.CAT_NO_SUCH_PLAN.getCode()) {
throw e;
} else {
- break;
+ // If we can't find an entry it probably means the plan has been retired so we keep looking...
+ continue;
}
}