Added basic support for failing messages too