Removed unused exception
Improved nesting support