Clarify error and message

One change is to narrow down an Error into InvalidTitle,
the other is to add the text itself to the message reporting
regex match against it.

Change-Id: Ibf120f025047e0dde27cd9af512526f444563949
Merge "Clarify error and message"