Merge pull request #34 from chrqls/dev

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