Merge "Check if bp.perm is null before resolving it"