Merge "Check for perm being null in base permission"