better handling message