CA-141502: Message_destroy fixes