Minor edits and exception changes.