Merge "Fix NPE in permissionCheck"