Updated diagnostic message to contain important values from the command message.
Merged.