Merge pull request #147 from TheBlueMatt/2018-09-channelmanager-err-macro