improved exception handling
update tests to reflect new exception handling
update admin files with feature changes