master: add codeblock and error-processing