Now appears to be checking Exceptions, further testing and docs updates required