split extract and execute messages
fix bad merge
add more tests
enable on error resume next
Merge pull request #1824 from Particular/GatewayCallbackFailure

split extract and execute messages