fa2f0fd6b4
This helps with creating better error messages, because we can now see where in the pipeline the error occurred