Moving exceptions into logical container