surface: Add null check on role_data