Be more consistent about message.

Only include a message string if it is there.