WIP: Bail on patching errors

[ashthespy]

Throw errors and bail when errors are found in either of the patching stages.