Added a few changes to handle exceptions of exceptions