Minor touchups from another run through
Exceptions are now logged directly in error.log