Add message destruction on failure

Targets #346