Should we add `puffing-billy: ` to these returned errors to be more clear where they're coming from?