Added Inner-Exception support