Move error handling code to its own section/file
Merge branch 'error_section' into develop