Better handling of hipchat