Sorted out the new exception mashalling

Signed-off-by: tfindlow <tfindlow@hotmail.com>