[Issue 25] v2 of the 'forwarding exception' code