Also include the error number in the string even if there is a message, because otherwise looking them up is hard.

Also remove the trailing newline from the message.