Merge "Fix for NPE when subscription is not found" into main