Improving error message.#848