changes made to exceptions and config files
more changes made to exceptions and config files