added exceptions to analysis