Re-organized exceptions. Beginning of context.