Merge pull request #254 from TheBlueMatt/2018-11-channelerror