Move CLException handling to test class to handle error globally.