Add escaping and error info.