Merge pull request #201 from TheBlueMatt/2018-09-channelerror-1