Exception handling minor improvement

Exception handling minor improvement