removed BaseException = Exception logic, thanks Jonathan