Fix possible crash with handling extras.