Nested exception fix