Small fix around error reporting