Fixed a bug during error reporting which would throw another exception.
Content additions and corrections; need to figure out how to take the ferry for some of these.