Merge "PBAP Handle IllegalArgumentException"