Fix exception description
Add deep expanding (2 levels deep should be reasonable)