Merge "fix: Invalid subscription plan cause NPE"