Compacted regex and improved the message.