Better message handling.