New exception introduced, minor parts rewritten