Added two more fields to the diagnostic message.