Add enhanced message and its corresponding error-handling, resent
mechanism. Fix #61.