Amend previous "error argument" commit

- Use the same convention to pass the error argument throughout the code.
  Consistency leads to better maintainability;