Tweak error and document