Fix matterhorn's error reporting