Improved kick message handling