Merge branch 'creativepragmatics/error-handling' into cp