A few minor issues with errors and process reporting
This will create a new commit in order to revert the existing changes.
