[System] Bringing the exceptions up to spec.