Reword.
Some minor error handling.