[WIP] Fixed #253 - Prevent patch step from being interrupted

shouldn't this happen even if there isn't an error?