Merge xchat r1525

Fixes possible crash