added exceptions back in