From dba0d0c1ae354327e5c76477905e0619710a6d4c Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Sat, 19 Aug 2023 01:50:29 +0200
Subject: [PATCH] build(Needs bump): Bump dependencies

---
 build.gradle.kts                              |  2 +-
 .../app/revanced/extensions/Extensions.kt     | 25 ++++++++---
 .../kotlin/app/revanced/meta/JsonGenerator.kt |  3 --
 .../app/revanced/meta/PatchesFileGenerator.kt | 19 ++++----
 .../patch/ExportAllActivitiesPatch.kt         |  8 +---
 .../patch/PredictiveBackGesturePatch.kt       |  6 +--
 .../patch/EnableAndroidDebuggingPatch.kt      |  4 +-
 .../patch/OverrideCertificatePinningPatch.kt  |  8 +---
 .../patch/ChangePackageNamePatch.kt           |  6 +--
 .../RemoveCaptureRestrictionResourcePatch.kt  |  6 +--
 .../misc/pro/patch/ProUnlockPatch.kt          |  8 +---
 .../candylinkvpn/patch/UnlockProPatch.kt      |  8 +---
 .../patch/BootloaderDetectionPatch.kt         |  8 +---
 .../root/patch/RootDetectionPatch.kt          |  8 +---
 .../patch/RemoveDeviceRestrictions.kt         |  8 +---
 .../hexeditor/ad/patch/HexEditorAdsPatch.kt   |  6 +--
 .../misc/pro/patch/UnlockProPatch.kt          |  6 +--
 .../root/patch/RootDetectionPatch.kt          |  6 +--
 .../signature/patch/SpoofSignaturePatch.kt    |  5 +--
 .../inshorts/ad/patch/InshortsAdsPatch.kt     |  8 +---
 .../timeline/patch/HideTimelineAdsPatch.kt    | 12 ++----
 .../patches/irplus/ad/patch/IrplusAdsPatch.kt |  6 +--
 .../login/patch/DisableMandatoryLoginPatch.kt |  6 +--
 .../misc/premium/patch/UnlockPremiumPatch.kt  |  6 +--
 .../license/patch/LicenseValidationPatch.kt   |  6 +--
 .../patch/SignatureVerificationPatch.kt       |  6 +--
 .../misc/pro/patch/UnlockProVersionPatch.kt   |  6 +--
 .../ads/inbox/patch/HideInboxAdsPatch.kt      |  8 +---
 ...tchingEmojiToStickerInMessageInputField.kt |  6 +--
 .../patch/DisableTypingIndicator.kt           |  6 +--
 .../moneymanager/patch/UnlockProPatch.kt      |  5 +--
 .../ad/video/patch/MusicVideoAdsPatch.kt      |  6 +--
 .../audio/codecs/patch/CodecsUnlockPatch.kt   |  7 +--
 .../patch/ExclusiveAudioPatch.kt              |  6 +--
 .../patch/PermanentRepeatPatch.kt             |  8 +---
 .../patch/PermanentShufflePatch.kt            |  8 +---
 .../compactheader/patch/CompactHeaderPatch.kt |  6 +--
 .../patch/MinimizedPlaybackPatch.kt           |  6 +--
 .../premium/patch/HideGetPremiumPatch.kt      |  6 +--
 .../patch/RemoveUpgradeButtonPatch.kt         |  5 +--
 .../patch/BypassCertificateChecksPatch.kt     |  8 +---
 .../patch/bytecode/MicroGBytecodePatch.kt     | 43 +++++++++----------
 .../patch/resource/MicroGResourcePatch.kt     |  5 +--
 .../patch/BackgroundPlayPatch.kt              |  6 +--
 .../misc/pro/patch/UnlockProPatch.kt          |  6 +--
 .../patch/RemoveBroadcastsRestrictionPatch.kt |  6 +--
 .../misc/pro/patch/UnlockProPatch.kt          |  8 +---
 .../nyx/misc/pro/patch/UnlockProPatch.kt      |  6 +--
 .../patch/SignatureDetectionPatch.kt          |  6 +--
 .../misc/unlockplus/patch/UnlockPlusPatch.kt  |  8 +---
 .../patches/pixiv/ads/patch/HideAdsPatch.kt   |  8 +---
 .../reddit/ad/banner/patch/HideBannerPatch.kt |  6 +--
 .../ad/comments/patch/HideCommentAdsPatch.kt  |  5 +--
 .../reddit/ad/general/patch/HideAdsPatch.kt   |  6 +--
 .../customclients/AbstractSpoofClientPatch.kt | 26 +++++------
 .../baconreader/api/patch/SpoofClientPatch.kt |  6 +--
 .../api/patch/SpoofClientPatch.kt             |  6 +--
 .../api/patch/SpoofClientPatch.kt             |  6 +--
 .../ads/patch/DisableAdsPatch.kt              |  8 +---
 .../api/patch/SpoofClientPatch.kt             |  6 +--
 .../patch/DisablePiracyDetectionPatch.kt      |  8 +---
 .../redditisfun/api/patch/SpoofClientPatch.kt | 10 +----
 .../api/patch/SpoofClientPatch.kt             |  6 +--
 .../slide/api/patch/SpoofClientPatch.kt       |  6 +--
 .../ads/patch/DisableAdsPatch.kt              |  8 +---
 .../DisableSyncForLemmyBottomSheetPatch.kt    |  6 +--
 .../api/patch/SpoofClientPatch.kt             |  8 +---
 .../patch/DisablePiracyDetectionPatch.kt      |  6 +--
 .../patch/DisableScreenshotPopupPatch.kt      |  8 +---
 .../premiumicon/patch/PremiumIconPatch.kt     |  5 +--
 .../url/patch/SanitizeUrlQueryPatch.kt        |  8 +---
 .../patch/RemoveDebuggingDetectionPatch.kt    |  5 +--
 .../patch/AbstractIntegrationsPatch.kt        | 29 ++++---------
 .../misc/patch/ResourceMappingPatch.kt        |  6 +--
 .../patch/VerticalScrollPatch.kt              |  8 +---
 .../patch/AbstractSettingsResourcePatch.kt    |  8 +---
 .../songpal/badge/patch/BadgeTabPatch.kt      |  8 +---
 .../patch/RemoveNotificationBadgePatch.kt     |  8 +---
 .../spotify/layout/theme/patch/ThemePatch.kt  |  8 ++--
 .../lite/ondemand/patch/OnDemandPatch.kt      |  7 +--
 .../patch/PremiumNavbarTabPatch.kt            |  6 +--
 .../themeunlock/patch/UnlockThemePatch.kt     |  6 +--
 .../patches/tiktok/ad/patch/HideAdsPatch.kt   |  9 ++--
 .../feedfilter/patch/FeedFilterPatch.kt       |  5 +--
 .../downloads/patch/DownloadsPatch.kt         | 10 ++---
 .../seekbar/patch/ShowSeekbarPatch.kt         |  7 +--
 .../speed/patch/PlaybackSpeedPatch.kt         |  6 +--
 .../patch/DisableLoginRequirementPatch.kt     |  5 +--
 .../fixgoogle/patch/FixGoogleLoginPatch.kt    |  5 +--
 .../misc/settings/patch/SettingsPatch.kt      | 14 +++---
 .../misc/spoof/sim/patch/SpoofSimPatch.kt     |  6 +--
 .../patches/trakt/patch/UnlockProPatch.kt     | 10 ++---
 .../unlock/patch/UnlockPaidWidgetsPatch.kt    |  8 +---
 .../twitch/ad/audio/patch/AudioAdsPatch.kt    |  6 +--
 .../ad/embedded/patch/EmbeddedAdsPatch.kt     | 10 ++---
 .../twitch/ad/video/patch/VideoAdsPatch.kt    | 12 ++----
 .../patch/ShowDeletedMessagesPatch.kt         | 12 ++----
 .../patch/AutoClaimChannelPointsPatch.kt      |  8 +---
 .../twitch/debug/patch/DebugModePatch.kt      |  8 +---
 .../settings/bytecode/patch/SettingsPatch.kt  | 14 +++---
 .../dynamiccolor/patch/DynamicColorPatch.kt   | 10 ++---
 .../misc/hook/json/patch/JsonHookPatch.kt     | 16 +++----
 .../misc/hook/patch/BaseHookPatchPatch.kt     |  9 +---
 .../vsco/misc/pro/patch/UnlockProPatch.kt     |  8 +---
 .../patch/FirebaseGetCertPatch.kt             |  6 +--
 .../promocode/patch/PromoCodeUnlockPatch.kt   |  6 +--
 .../misc/unlockpro/patch/UnlockProPatch.kt    |  6 +--
 .../ad/general/bytecode/patch/HideAdsPatch.kt |  6 +--
 .../resource/patch/HideAdsResourcePatch.kt    |  6 +--
 .../HideGetPremiumVideoAdvertisementPatch.kt  |  8 +---
 .../youtube/ad/video/patch/VideoAdsPatch.kt   |  6 +--
 .../patch/CopyVideoUrlBytecodePatch.kt        |  6 +--
 .../patch/CopyVideoUrlResourcePatch.kt        |  6 +--
 .../patch/ExternalDownloadsBytecodePatch.kt   |  6 +--
 .../patch/ExternalDownloadsResourcePatch.kt   |  6 +--
 .../patch/EnableSeekbarTappingPatch.kt        | 10 ++---
 .../EnableSeekbarTappingResourcePatch.kt      |  5 +--
 .../bytecode/SwipeControlsBytecodePatch.kt    |  7 +--
 .../resource/SwipeControlsResourcePatch.kt    |  5 +--
 .../autocaptions/patch/AutoCaptionsPatch.kt   |  6 +--
 .../header/patch/PremiumHeadingPatch.kt       | 12 ++----
 .../icon/patch/CustomBrandingPatch.kt         |  4 +-
 .../buttons/action/patch/HideButtonsPatch.kt  |  6 +--
 .../autoplay/patch/HideAutoplayButtonPatch.kt |  8 +---
 .../captions/patch/HideCaptionsButtonPatch.kt |  6 +--
 .../buttons/cast/patch/HideCastButtonPatch.kt | 12 ++----
 .../patch/NavigationButtonsPatch.kt           | 11 ++---
 .../patch/ResolvePivotBarFingerprintsPatch.kt | 13 +++---
 .../hide/patch/HidePlayerButtonsPatch.kt      |  7 +--
 .../bytecode/patch/AlbumCardsPatch.kt         |  8 +---
 .../resource/patch/AlbumCardsResourcePatch.kt |  6 +--
 .../bytecode/patch/BreakingNewsPatch.kt       |  8 +---
 .../patch/BreakingNewsResourcePatch.kt        |  6 +--
 .../hide/comments/patch/CommentsPatch.kt      |  6 +--
 .../bytecode/patch/CrowdfundingBoxPatch.kt    |  8 +---
 .../patch/CrowdfundingBoxResourcePatch.kt     |  6 +--
 .../bytecode/patch/HideEndscreenCardsPatch.kt |  6 +--
 .../patch/HideEndscreenCardsResourcePatch.kt  |  6 +--
 .../filterbar/patch/HideFilterBarPatch.kt     |  6 +--
 .../patch/HideFilterBarResourcePatch.kt       |  6 +--
 .../HideFloatingMicrophoneButtonPatch.kt      |  8 +---
 ...deFloatingMicrophoneButtonResourcePatch.kt |  9 ++--
 .../patch/HideLayoutComponentsPatch.kt        |  8 +---
 .../infocards/patch/HideInfoCardsPatch.kt     |  6 +--
 .../patch/HideInfocardsResourcePatch.kt       |  6 +--
 .../bytecode/patch/HideLoadMoreButtonPatch.kt |  8 +---
 .../patch/HideLoadMoreButtonResourcePatch.kt  |  6 +--
 .../bytecode/patch/HideEmailAddressPatch.kt   |  8 +---
 .../patch/HideEmailAddressResourcePatch.kt    |  6 +--
 .../patch/HidePlayerFlyoutMenuPatch.kt        |  6 +--
 .../bytecode/patch/HidePlayerOverlayPatch.kt  |  8 +---
 .../patch/HidePlayerOverlayResourcePatch.kt   |  6 +--
 .../hide/seekbar/patch/HideSeekbarPatch.kt    |  6 +--
 .../patch/HideShortsComponentsPatch.kt        | 16 +++----
 .../HideShortsComponentsResourcePatch.kt      |  6 +--
 .../hide/time/patch/HideTimestampPatch.kt     |  8 +---
 .../watermark/patch/HideWatermarkPatch.kt     | 10 ++---
 .../popup/patch/PlayerPopupPanelsPatch.kt     |  8 +---
 .../patch/PlayerControlsBackgroundPatch.kt    |  6 +--
 .../patch/ReturnYouTubeDislikePatch.kt        | 16 +++----
 .../ReturnYouTubeDislikeResourcePatch.kt      |  6 +--
 .../searchbar/patch/WideSearchbarPatch.kt     |  9 +---
 .../patch/SeekbarColorBytecodePatch.kt        | 13 ++----
 .../resource/SeekbarColorResourcePatch.kt     | 11 +++--
 .../resource/SeekbarPreferencesPatch.kt       |  4 +-
 .../patch/SponsorBlockBytecodePatch.kt        | 19 +++-----
 .../patch/SponsorBlockResourcePatch.kt        |  6 +--
 .../bytecode/patch/SpoofAppVersionPatch.kt    |  8 +---
 .../patch/DisableShortsOnStartupPatch.kt      |  6 +--
 .../patch/TabletMiniPlayerPatch.kt            | 15 +++----
 .../bytecode/patch/LithoColorHookPatch.kt     |  8 +---
 .../bytecode/patch/ThemeBytecodePatch.kt      |  4 +-
 .../theme/resource/ThemeResourcePatch.kt      | 10 ++---
 .../AlternativeThumbnailsCompatibility.kt     |  2 +-
 ...tURLRequestCallbackOnFailureFingerprint.kt |  2 +-
 ...estCallbackOnResponseStartedFingerprint.kt |  2 +-
 ...RLRequestCallbackOnSucceededFingerprint.kt |  2 +-
 .../MessageDigestImageUrlFingerprint.kt       |  2 +-
 .../MessageDigestImageUrlParentFingerprint.kt |  2 +-
 .../patch/AlternativeThumbnailsPatch.kt       | 36 +++++-----------
 .../misc/autorepeat/patch/AutoRepeatPatch.kt  | 13 +++---
 .../hook/patch/BottomSheetHookPatch.kt        |  8 +---
 .../patch/BottomSheetHookResourcePatch.kt     | 10 ++---
 .../misc/debugging/patch/DebuggingPatch.kt    |  6 +--
 .../patch/FixBackToExitGesturePatch.kt        | 17 ++------
 .../fix/playback/patch/ClientSpoofPatch.kt    |  8 +---
 .../patch/SpoofSignatureVerificationPatch.kt  | 15 +++----
 ...SpoofSignatureVerificationResourcePatch.kt |  6 +--
 .../open/patch/OpenLinksExternallyPatch.kt    |  8 +---
 .../litho/filter/patch/LithoFilterPatch.kt    | 14 +++---
 .../patch/bytecode/MicroGBytecodePatch.kt     |  6 +--
 .../patch/resource/MicroGResourcePatch.kt     |  6 +--
 .../patch/MinimizedPlaybackPatch.kt           | 15 +++----
 .../patch/PlayerControlsBytecodePatch.kt      |  8 +---
 .../patch/BottomControlsResourcePatch.kt      |  8 +---
 .../patch/PlayerOverlaysHookPatch.kt          |  5 +--
 .../playertype/patch/PlayerTypeHookPatch.kt   | 10 ++---
 .../settings/bytecode/patch/SettingsPatch.kt  |  8 +---
 .../resource/patch/SettingsResourcePatch.kt   |  8 +---
 .../zoomhaptics/patch/ZoomHapticsPatch.kt     |  6 +--
 .../hdrbrightness/patch/HDRBrightnessPatch.kt |  6 +--
 .../patch/VideoInformationPatch.kt            |  9 +---
 .../patch/RememberVideoQualityPatch.kt        | 20 ++++-----
 .../youtube/video/speed/PlaybackSpeed.kt      |  5 +--
 .../custom/patch/CustomPlaybackSpeedPatch.kt  | 14 +++---
 .../patch/RememberPlaybackSpeedPatch.kt       |  8 +---
 .../video/videoid/patch/VideoIdPatch.kt       |  6 +--
 .../patch/OldVideoQualityMenuPatch.kt         |  6 +--
 .../patch/OldVideoQualityMenuResourcePatch.kt | 10 ++---
 .../ad/general/patch/HideAdsPatch.kt          |  8 +---
 .../unlockpremium/patch/UnlockPremiunPatch.kt |  5 +--
 .../util/microg/MicroGBytecodeHelper.kt       | 24 +++++------
 .../AbstractTransformInstructionsPatch.kt     |  6 +--
 .../revanced/util/resources/ResourceUtils.kt  |  2 +-
 214 files changed, 473 insertions(+), 1271 deletions(-)
 rename src/main/kotlin/app/revanced/patches/all/activity/{exportAll => exportall}/patch/ExportAllActivitiesPatch.kt (84%)
 rename src/main/kotlin/app/revanced/patches/youtube/layout/{alternativethumbnails => thumbnails}/annotations/AlternativeThumbnailsCompatibility.kt (79%)
 rename src/main/kotlin/app/revanced/patches/youtube/layout/{alternativethumbnails/bytecode => thumbnails}/fingerprints/CronetURLRequestCallbackOnFailureFingerprint.kt (85%)
 rename src/main/kotlin/app/revanced/patches/youtube/layout/{alternativethumbnails/bytecode => thumbnails}/fingerprints/CronetURLRequestCallbackOnResponseStartedFingerprint.kt (88%)
 rename src/main/kotlin/app/revanced/patches/youtube/layout/{alternativethumbnails/bytecode => thumbnails}/fingerprints/CronetURLRequestCallbackOnSucceededFingerprint.kt (85%)
 rename src/main/kotlin/app/revanced/patches/youtube/layout/{alternativethumbnails/bytecode => thumbnails}/fingerprints/MessageDigestImageUrlFingerprint.kt (79%)
 rename src/main/kotlin/app/revanced/patches/youtube/layout/{alternativethumbnails/bytecode => thumbnails}/fingerprints/MessageDigestImageUrlParentFingerprint.kt (82%)
 rename src/main/kotlin/app/revanced/patches/youtube/layout/{alternativethumbnails/bytecode => thumbnails}/patch/AlternativeThumbnailsPatch.kt (78%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7b793352..88bcaec7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:13.0.0")
+    implementation("app.revanced:revanced-patcher:14.0.0")
     implementation("com.android.tools.smali:smali:3.0.3")
     // Required because build fails without it.
     // TODO: Find a way to remove this dependency.
diff --git a/src/main/kotlin/app/revanced/extensions/Extensions.kt b/src/main/kotlin/app/revanced/extensions/Extensions.kt
index 1998cf1d..649cf6c2 100644
--- a/src/main/kotlin/app/revanced/extensions/Extensions.kt
+++ b/src/main/kotlin/app/revanced/extensions/Extensions.kt
@@ -1,9 +1,10 @@
 package app.revanced.extensions
 
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -13,13 +14,12 @@ import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
 import com.android.tools.smali.dexlib2.util.MethodUtil
 import org.w3c.dom.Node
 
-// TODO: populate this to all patches
 /**
- * Convert a [MethodFingerprint] to a [PatchResultError].
+ * Return [PatchException] from a [MethodFingerprint].
  *
- * @return A [PatchResultError] for the [MethodFingerprint].
+ * @return The [PatchException] for the [MethodFingerprint].
  */
-internal fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
+internal fun MethodFingerprint.toErrorResult() = PatchException("Failed to resolve $name")
 
 /**
  * Find the [MutableMethod] from a given [Method] in a [MutableClass].
@@ -82,3 +82,16 @@ fun Method.indexOfFirstConstantInstructionValue(constantValue: Long): Int {
 fun Method.containsConstantInstructionValue(constantValue: Long): Boolean {
     return indexOfFirstConstantInstructionValue(constantValue) >= 0
 }
+
+/**
+ * traverse the class hierarchy starting from the given root class
+ *
+ * @param targetClass the class to start traversing the class hierarchy from
+ * @param callback function that is called for every class in the hierarchy
+ */
+fun BytecodeContext.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
+    callback(targetClass)
+    this.findClass(targetClass.superclass ?: return)?.mutableClass?.let {
+        traverseClassHierarchy(it, callback)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/meta/JsonGenerator.kt b/src/main/kotlin/app/revanced/meta/JsonGenerator.kt
index cebf57d9..3be7793f 100644
--- a/src/main/kotlin/app/revanced/meta/JsonGenerator.kt
+++ b/src/main/kotlin/app/revanced/meta/JsonGenerator.kt
@@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.PatchExtensions.description
 import app.revanced.patcher.extensions.PatchExtensions.include
 import app.revanced.patcher.extensions.PatchExtensions.options
 import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.extensions.PatchExtensions.version
 import app.revanced.patcher.patch.PatchOption
 import com.google.gson.GsonBuilder
 import java.io.File
@@ -17,7 +16,6 @@ internal class JsonGenerator : PatchesFileGenerator {
             JsonPatch(
                 it.patchName,
                 it.description ?: "This patch has no description.",
-                it.version ?: "0.0.0",
                 !it.include,
                 it.options?.map { option ->
                     JsonPatch.Option(
@@ -48,7 +46,6 @@ internal class JsonGenerator : PatchesFileGenerator {
     private class JsonPatch(
         val name: String,
         val description: String,
-        val version: String,
         val excluded: Boolean,
         val options: Array<Option>,
         val dependencies: Array<String>,
diff --git a/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt b/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt
index dfb57d92..23c1d100 100644
--- a/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt
+++ b/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt
@@ -1,25 +1,22 @@
 package app.revanced.meta
 
-import app.revanced.patcher.data.Context
-import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.util.patch.PatchBundle
+import app.revanced.patcher.PatchBundleLoader
+import app.revanced.patcher.patch.PatchClass
 import java.io.File
 
-internal typealias PatchBundlePatches = List<Class<out Patch<Context>>>
+internal typealias PatchBundlePatches = List<PatchClass>
 
 internal interface PatchesFileGenerator {
     fun generate(bundle: PatchBundlePatches)
 
     private companion object {
         @JvmStatic
-        fun main(args: Array<String>) = PatchBundle.Jar(
-            File("build/libs/").listFiles()!!.first {
-                it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar")
-            }.absolutePath
-        ).loadPatches().also {
-            if (it.isEmpty()) throw IllegalStateException("No patches found")
+        fun main(args: Array<String>) = PatchBundleLoader.Jar(
+            File("build/libs/").listFiles { it -> it.name.endsWith(".jar") }!!.first()
+        ).also { loader ->
+            if (loader.isEmpty()) throw IllegalStateException("No patches found")
         }.let { bundle ->
-            arrayOf(JsonGenerator()).forEach { it.generate(bundle) }
+            arrayOf(JsonGenerator()).forEach { generator -> generator.generate(bundle) }
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/all/activity/exportAll/patch/ExportAllActivitiesPatch.kt b/src/main/kotlin/app/revanced/patches/all/activity/exportall/patch/ExportAllActivitiesPatch.kt
similarity index 84%
rename from src/main/kotlin/app/revanced/patches/all/activity/exportAll/patch/ExportAllActivitiesPatch.kt
rename to src/main/kotlin/app/revanced/patches/all/activity/exportall/patch/ExportAllActivitiesPatch.kt
index b80fb242..4d67cdeb 100644
--- a/src/main/kotlin/app/revanced/patches/all/activity/exportAll/patch/ExportAllActivitiesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/activity/exportall/patch/ExportAllActivitiesPatch.kt
@@ -1,10 +1,8 @@
-package app.revanced.patches.all.activity.exportAll.patch
+package app.revanced.patches.all.activity.exportall.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 
@@ -12,7 +10,7 @@ import app.revanced.patcher.patch.annotations.Patch
 @Name("Export all activities")
 @Description("Makes all app activities exportable.")
 class ExportAllActivitiesPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         context.xmlEditor["AndroidManifest.xml"].use { editor ->
             val document = editor.file
             val activities = document.getElementsByTagName("activity")
@@ -33,8 +31,6 @@ class ExportAllActivitiesPatch : ResourcePatch {
                 }
             }
         }
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt b/src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt
index 41248766..22763c67 100644
--- a/src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt
@@ -3,8 +3,6 @@ package app.revanced.patches.all.interaction.gestures.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 
@@ -12,7 +10,7 @@ import app.revanced.patcher.patch.annotations.Patch
 @Name("Predictive back gesture")
 @Description("Enables the predictive back gesture introduced on Android 13.")
 class PredictiveBackGesturePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         context.xmlEditor["AndroidManifest.xml"].use { editor ->
             val document = editor.file
 
@@ -25,8 +23,6 @@ class PredictiveBackGesturePatch : ResourcePatch {
 
             }
         }
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt b/src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
index e575ad08..bf456d15 100644
--- a/src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
@@ -11,7 +11,7 @@ import org.w3c.dom.Element
 @Name("Enable android debugging")
 @Description("Enables Android debugging capabilities.")
 class EnableAndroidDebuggingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         context.xmlEditor["AndroidManifest.xml"].use { dom ->
             val applicationNode = dom
                 .file
@@ -21,8 +21,6 @@ class EnableAndroidDebuggingPatch : ResourcePatch {
             // set application as debuggable
             applicationNode.setAttribute("android:debuggable", "true")
         }
-
-        return PatchResultSuccess()
     }
 
 }
diff --git a/src/main/kotlin/app/revanced/patches/all/misc/network/patch/OverrideCertificatePinningPatch.kt b/src/main/kotlin/app/revanced/patches/all/misc/network/patch/OverrideCertificatePinningPatch.kt
index 0a3da723..5d571dbe 100644
--- a/src/main/kotlin/app/revanced/patches/all/misc/network/patch/OverrideCertificatePinningPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/network/patch/OverrideCertificatePinningPatch.kt
@@ -2,9 +2,8 @@ package app.revanced.patches.all.misc.network.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.all.misc.debugging.patch.EnableAndroidDebuggingPatch
@@ -16,8 +15,7 @@ import java.io.File
 @Description("Overrides certificate pinning, allowing to inspect traffic via a proxy.")
 @DependsOn([EnableAndroidDebuggingPatch::class])
 class OverrideCertificatePinningPatch : ResourcePatch {
-
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         val resXmlDirectory = context["res/xml"]
 
         // Add android:networkSecurityConfig="@xml/network_security_config" and the "networkSecurityConfig" attribute if it does not exist.
@@ -73,7 +71,5 @@ class OverrideCertificatePinningPatch : ResourcePatch {
 
             }
         }
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt b/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
index ab618dae..8498ee69 100644
--- a/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
@@ -11,20 +11,18 @@ import org.w3c.dom.Element
 @Name("Change package name")
 @Description("Changes the package name. Appends \".revanced\" to the package name by default.")
 class ChangePackageNamePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         val packageNameToUse = packageName ?: getDefaultPackageName(context)
 
         val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
         if (!packageNameToUse.matches(packageNameRegex))
-            return PatchResultError("Invalid package name")
+            throw PatchException("Invalid package name")
 
         val originalPackageName = getOriginalPackageName(context)
 
         context["AndroidManifest.xml"].apply {
             readText().replace(originalPackageName, packageNameToUse).let(::writeText)
         }
-
-        return PatchResultSuccess()
     }
 
     private fun getDefaultPackageName(context: ResourceContext): String {
diff --git a/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt b/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt
index 4efd191e..880b32c3 100644
--- a/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt
@@ -2,14 +2,12 @@ package app.revanced.patches.all.screencapture.removerestriction.resource.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import org.w3c.dom.Element
 
 @Description("Sets allowAudioPlaybackCapture in manifest to true.")
 internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         // create an xml editor instance
         context.xmlEditor["AndroidManifest.xml"].use { dom ->
             // get the application node
@@ -21,7 +19,5 @@ internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
             // set allowAudioPlaybackCapture attribute to true
             applicationNode.setAttribute("android:allowAudioPlaybackCapture", "true")
         }
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt b/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt
index fa626f4d..b5ed2aae 100644
--- a/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.backdrops.misc.pro.annotations.ProUnlockCompatibility
 import app.revanced.patches.backdrops.misc.pro.fingerprints.ProUnlockFingerprint
@@ -21,7 +19,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ProUnlockPatch : BytecodePatch(
     listOf(ProUnlockFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ProUnlockFingerprint.result?.let { result ->
             val registerIndex = result.scanResult.patternScanResult!!.endIndex - 1
 
@@ -35,8 +33,6 @@ class ProUnlockPatch : BytecodePatch(
                 )
             }
 
-        } ?: return ProUnlockFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw ProUnlockFingerprint.toErrorResult()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt b/src/main/kotlin/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt
index c15c6934..8c7713bf 100644
--- a/src/main/kotlin/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.candylinkvpn.annotations.UnlockProCompatibility
 import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerprint
@@ -19,15 +17,13 @@ import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerpr
 class UnlockProPatch : BytecodePatch(
     listOf(IsPremiumPurchasedFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         IsPremiumPurchasedFingerprint.result?.mutableMethod?.addInstructions(
             0,
             """
                const/4 v0, 0x1
                return v0
             """
-        ) ?: return IsPremiumPurchasedFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw IsPremiumPurchasedFingerprint.toErrorResult()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt b/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt
index 61ed8c57..d2e9231f 100644
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.BootStateFingerprint
 import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.CreateKeyFingerprint
@@ -21,7 +19,7 @@ import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionC
 class BootloaderDetectionPatch : BytecodePatch(
     listOf(CreateKeyFingerprint, BootStateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         arrayOf(CreateKeyFingerprint, BootStateFingerprint).forEach { fingerprint ->
             fingerprint.result?.mutableMethod?.addInstructions(
                 0,
@@ -29,9 +27,7 @@ class BootloaderDetectionPatch : BytecodePatch(
                         const/4 v0, 0x1
                         return v0
                 """
-            ) ?: return fingerprint.toErrorResult()
+            ) ?: throw fingerprint.toErrorResult()
         }
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt b/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt
index a7a00661..820b309b 100644
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.finanzonline.detection.root.fingerprints.RootDetectionFingerprint
 import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
@@ -19,15 +17,13 @@ import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionC
 class RootDetectionPatch : BytecodePatch(
     listOf(RootDetectionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         RootDetectionFingerprint.result?.mutableMethod?.addInstructions(
             0,
             """
                 sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
                 return-object v0
             """
-        ) ?: return RootDetectionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw RootDetectionFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt b/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt
index 0e08ea9d..a0519588 100644
--- a/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt
+++ b/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt
@@ -10,8 +10,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.googlerecorder.restrictions.fingerprints.OnApplicationCreateFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@@ -23,7 +21,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class RemoveDeviceRestrictions : BytecodePatch(
     listOf(OnApplicationCreateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         OnApplicationCreateFingerprint.result?.let {
             val featureStringIndex = it.scanResult.stringsScanResult!!.matches.first().index
 
@@ -36,8 +34,6 @@ class RemoveDeviceRestrictions : BytecodePatch(
                 // Override "isPixelDevice()" to return true.
                 addInstruction(featureStringIndex, "const/4 v$featureAvailableRegister, 0x1")
             }
-        } ?: return OnApplicationCreateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw OnApplicationCreateFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt b/src/main/kotlin/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt
index e5ad20d5..84d4dbf9 100644
--- a/src/main/kotlin/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.hexeditor.ad.annotations.HexEditorAdsCompatibility
 import app.revanced.patches.hexeditor.ad.fingerprints.PrimaryAdsFingerprint
@@ -20,7 +18,7 @@ class HexEditorAdsPatch : BytecodePatch(
         PrimaryAdsFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val method = PrimaryAdsFingerprint.result!!.mutableMethod
         
         method.replaceInstructions(
@@ -30,7 +28,5 @@ class HexEditorAdsPatch : BytecodePatch(
                 return v0
             """
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt b/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt
index bb866bff..13d8c849 100644
--- a/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.iconpackstudio.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerprint
@@ -20,7 +18,7 @@ class UnlockProPatch : BytecodePatch(
         CheckProFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val method = CheckProFingerprint.result!!.mutableMethod
         method.addInstructions(
             0,
@@ -29,7 +27,5 @@ class UnlockProPatch : BytecodePatch(
                 return v0
             """
         )
-        
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt b/src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt
index 04c486bb..f7edc70c 100644
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.idaustria.detection.root.fingerprints.RootDetectionFingerprint
 import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
@@ -18,8 +16,6 @@ import app.revanced.patches.idaustria.detection.shared.annotations.DetectionComp
 class RootDetectionPatch : BytecodePatch(
     listOf(RootDetectionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) =
         RootDetectionFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
-        return PatchResultSuccess()
-    }
 }
diff --git a/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt b/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt
index 6c1c229b..29585504 100644
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
 import app.revanced.patches.idaustria.detection.signature.fingerprints.SpoofSignatureFingerprint
@@ -32,7 +30,7 @@ class SpoofSignaturePatch : BytecodePatch(
                 "bf42c121d620ddfb7914f7a95c713d9e1c1b7bdb4a03d618e40cf7e9e235c0b5687e03b7ab3,publicExponent=10001}"
     }
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SpoofSignatureFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
@@ -40,6 +38,5 @@ class SpoofSignaturePatch : BytecodePatch(
                 return-object v0 
             """
         )
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt b/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
index a0b314e7..ef882c63 100644
--- a/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.inshorts.ad.annotations.HideAdsCompatibility
 import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
@@ -19,7 +17,7 @@ import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
 class HideAdsPatch : BytecodePatch(
     listOf(InshortsAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         InshortsAdsFingerprint.result?.let { result ->
             result.apply {
                 mutableMethod.addInstruction(
@@ -29,8 +27,6 @@ class HideAdsPatch : BytecodePatch(
                     """
                 )
             }
-        } ?: return InshortsAdsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw InshortsAdsFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt
index 82c5f6b6..79a1ba50 100644
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.MediaFingerprint
@@ -32,19 +30,19 @@ class HideTimelineAdsPatch : BytecodePatch(
         PaidPartnershipAdFingerprint // Unlike the other ads this one is resolved from all classes.
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // region Resolve required methods to check for ads.
 
-        ShowAdFingerprint.result ?: return ShowAdFingerprint.toErrorResult()
+        ShowAdFingerprint.result ?: throw ShowAdFingerprint.toErrorResult()
 
-        PaidPartnershipAdFingerprint.result ?: return PaidPartnershipAdFingerprint.toErrorResult()
+        PaidPartnershipAdFingerprint.result ?: throw PaidPartnershipAdFingerprint.toErrorResult()
 
         MediaFingerprint.result?.let {
             GenericMediaAdFingerprint.resolve(context, it.classDef)
             ShoppingAdFingerprint.resolve(context, it.classDef)
 
             return@let
-        } ?: return MediaFingerprint.toErrorResult()
+        } ?: throw MediaFingerprint.toErrorResult()
 
         // endregion
 
@@ -99,7 +97,5 @@ class HideTimelineAdsPatch : BytecodePatch(
 
             // endregion
         }
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt b/src/main/kotlin/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt
index c4e93e7c..a138d5fd 100644
--- a/src/main/kotlin/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.irplus.ad.annotations.IrplusAdsCompatibility
 import app.revanced.patches.irplus.ad.fingerprints.IrplusAdsFingerprint
@@ -19,13 +17,11 @@ import app.revanced.patches.irplus.ad.fingerprints.IrplusAdsFingerprint
 class IrplusAdsPatch : BytecodePatch(
     listOf(IrplusAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val method = IrplusAdsFingerprint.result!!.mutableMethod
 
         // By overwriting the second parameter of the method,
         // the view which holds the advertisement is removed.
         method.addInstruction(0, "const/4 p2, 0x0")
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/lightroom/misc/login/patch/DisableMandatoryLoginPatch.kt b/src/main/kotlin/app/revanced/patches/lightroom/misc/login/patch/DisableMandatoryLoginPatch.kt
index 49d4f46a..6759a209 100644
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/login/patch/DisableMandatoryLoginPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/login/patch/DisableMandatoryLoginPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.lightroom.misc.login.annotations.DisableMandatoryLoginCompatibility
 import app.revanced.patches.lightroom.misc.login.fingerprint.IsLoggedInFingerprint
@@ -15,13 +13,11 @@ import app.revanced.patches.lightroom.misc.login.fingerprint.IsLoggedInFingerpri
 @Name("Disable mandatory login")
 @DisableMandatoryLoginCompatibility
 class DisableMandatoryLoginPatch : BytecodePatch(listOf(IsLoggedInFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         IsLoggedInFingerprint.result?.mutableMethod?.apply {
             val index = implementation!!.instructions.lastIndex - 1
             // Set isLoggedIn = true.
             replaceInstruction(index, "const/4 v0, 0x1")
         } ?: throw IsLoggedInFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/patch/UnlockPremiumPatch.kt b/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/patch/UnlockPremiumPatch.kt
index ccd59536..f854f726 100644
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/patch/UnlockPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/patch/UnlockPremiumPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.lightroom.misc.premium.annotations.UnlockPremiumCompatibility
 import app.revanced.patches.lightroom.misc.premium.fingerprint.HasPurchasedFingerprint
@@ -17,11 +15,9 @@ import app.revanced.patches.lightroom.misc.premium.fingerprint.HasPurchasedFinge
 @Description("Unlocks premium features.")
 @UnlockPremiumCompatibility
 class UnlockPremiumPatch : BytecodePatch(listOf(HasPurchasedFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
          // Set hasPremium = true.
         HasPurchasedFingerprint.result?.mutableMethod?.replaceInstruction(2, "const/4 v2, 0x1")
             ?: throw HasPurchasedFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt b/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt
index 34b11e48..21b0211b 100644
--- a/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt
@@ -5,15 +5,13 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.memegenerator.detection.license.fingerprint.LicenseValidationFingerprint
 
 @Description("Disables Firebase license validation.")
 class LicenseValidationPatch : BytecodePatch(
     listOf(LicenseValidationFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LicenseValidationFingerprint.result?.apply {
             mutableMethod.replaceInstructions(
                 0,
@@ -23,7 +21,5 @@ class LicenseValidationPatch : BytecodePatch(
                 """
             )
         } ?: throw LicenseValidationFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt b/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt
index 3105311b..2a74d0a1 100644
--- a/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt
@@ -5,15 +5,13 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.memegenerator.detection.signature.fingerprint.VerifySignatureFingerprint
 
 @Description("Disables detection of incorrect signature.")
 class SignatureVerificationPatch : BytecodePatch(
     listOf(VerifySignatureFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         VerifySignatureFingerprint.result?.apply {
             mutableMethod.replaceInstructions(
                 0,
@@ -23,7 +21,5 @@ class SignatureVerificationPatch : BytecodePatch(
                 """
             )
         } ?: throw VerifySignatureFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt b/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt
index 74ec5da7..e89a1063 100644
--- a/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.memegenerator.detection.license.patch.LicenseValidationPatch
@@ -28,7 +26,7 @@ class UnlockProVersionPatch : BytecodePatch(
         IsFreeVersionFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         IsFreeVersionFingerprint.result?.apply {
             mutableMethod.replaceInstructions(0,
                 """
@@ -37,7 +35,5 @@ class UnlockProVersionPatch : BytecodePatch(
                 """
             )
         } ?: throw IsFreeVersionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt b/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt
index e2d27212..0d90a50f 100644
--- a/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.messenger.ads.inbox.fingerprints.LoadInboxAdsFingerprint
 
@@ -17,12 +15,10 @@ import app.revanced.patches.messenger.ads.inbox.fingerprints.LoadInboxAdsFingerp
 class HideInboxAdsPatch : BytecodePatch(
     listOf(LoadInboxAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LoadInboxAdsFingerprint.result?.mutableMethod?.apply {
             this.replaceInstruction(0, "return-void")
-        } ?: return LoadInboxAdsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw LoadInboxAdsFingerprint.toErrorResult()
     }
 }
 
diff --git a/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt b/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt
index 50aac928..8912c6a4 100644
--- a/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.messenger.inputfield.fingerprints.SwitchMessangeInputEmojiButtonFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@@ -17,7 +15,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Disables switching from emoji to sticker search mode in message input field")
 @Compatibility([Package("com.facebook.orca")])
 class DisableSwitchingEmojiToStickerInMessageInputField : BytecodePatch(listOf(SwitchMessangeInputEmojiButtonFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SwitchMessangeInputEmojiButtonFingerprint.result?.let {
             val setStringIndex = it.scanResult.patternScanResult!!.startIndex + 2
 
@@ -30,7 +28,5 @@ class DisableSwitchingEmojiToStickerInMessageInputField : BytecodePatch(listOf(S
                 )
             }
         } ?: throw SwitchMessangeInputEmojiButtonFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt b/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt
index bb75cc1e..680f38d3 100644
--- a/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt
+++ b/src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.messenger.inputfield.fingerprints.SendTypingIndicatorFingerprint
 
@@ -18,10 +16,8 @@ import app.revanced.patches.messenger.inputfield.fingerprints.SendTypingIndicato
 @Description("Disables the indicator while typing a message")
 @Compatibility([Package("com.facebook.orca")])
 class DisableTypingIndicator : BytecodePatch(listOf(SendTypingIndicatorFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SendTypingIndicatorFingerprint.result?.mutableMethod?.replaceInstruction(0, "return-void")
             ?: throw SendTypingIndicatorFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt b/src/main/kotlin/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt
index 9de5db3f..a6bbe51c 100644
--- a/src/main/kotlin/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.moneymanager.annotations.UnlockProCompatibility
 import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
@@ -18,7 +16,7 @@ import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
 class UnlockProPatch : BytecodePatch(
     listOf(UnlockProFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        UnlockProFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
@@ -26,6 +24,5 @@ class UnlockProPatch : BytecodePatch(
                return v0 
             """
         )
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt
index ea852b9d..eca9604c 100644
--- a/src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsConstructorFingerprint
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsFingerprint
@@ -20,7 +18,7 @@ import app.revanced.patches.music.annotations.MusicCompatibility
 class MusicVideoAdsPatch : BytecodePatch(
     listOf(ShowMusicVideoAdsConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShowMusicVideoAdsFingerprint.resolve(context, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
 
         val result = ShowMusicVideoAdsFingerprint.result!!
@@ -31,7 +29,5 @@ class MusicVideoAdsPatch : BytecodePatch(
                 const/4 p1, 0x0
             """
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt b/src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt
index 045ee932..3dd5d59e 100644
--- a/src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt
@@ -3,10 +3,7 @@ package app.revanced.patches.music.audio.codecs.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.music.annotations.MusicCompatibility
@@ -23,7 +20,7 @@ class CodecsUnlockPatch : BytecodePatch(
         CodecsLockFingerprint, AllCodecsReferenceFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val codecsLockResult = CodecsLockFingerprint.result!!
 
         val implementation = codecsLockResult.mutableMethod.implementation!!
@@ -48,7 +45,5 @@ class CodecsUnlockPatch : BytecodePatch(
             instructionIndex,
             "invoke-static {}, ${allCodecsMethod.definingClass}->${allCodecsMethod.name}()Ljava/util/Set;".toInstruction()
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt b/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt
index c0a1d85d..51226811 100644
--- a/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
@@ -19,11 +17,9 @@ import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEna
 class ExclusiveAudioPatch : BytecodePatch(
     listOf(AudioOnlyEnablerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val method = AudioOnlyEnablerFingerprint.result!!.mutableMethod
         method.replaceInstruction(method.implementation!!.instructions.count() - 1, "const/4 v0, 0x1")
         method.addInstruction("return v0")
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/patch/PermanentRepeatPatch.kt b/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/patch/PermanentRepeatPatch.kt
index 0beb97ce..3dfc1102 100644
--- a/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/patch/PermanentRepeatPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/patch/PermanentRepeatPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.music.annotations.MusicCompatibility
@@ -21,7 +19,7 @@ import app.revanced.patches.music.interaction.permanentrepeat.fingerprints.Repea
 class PermanentRepeatPatch : BytecodePatch(
     listOf(RepeatTrackFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         RepeatTrackFingerprint.result?.let {
             val startIndex = it.scanResult.patternScanResult!!.endIndex
             val repeatIndex = startIndex + 3
@@ -33,8 +31,6 @@ class PermanentRepeatPatch : BytecodePatch(
                     ExternalLabel("repeat", getInstruction(repeatIndex))
                 )
             }
-        } ?: return RepeatTrackFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw RepeatTrackFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/patch/PermanentShufflePatch.kt b/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/patch/PermanentShufflePatch.kt
index c95d26b5..6a15edba 100644
--- a/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/patch/PermanentShufflePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/patch/PermanentShufflePatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.interaction.permanentshuffle.fingerprints.DisableShuffleFingerprint
@@ -20,10 +18,8 @@ import app.revanced.patches.music.interaction.permanentshuffle.fingerprints.Disa
 class PermanentShuffleTogglePatch : BytecodePatch(
     listOf(DisableShuffleFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         DisableShuffleFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
-            ?: return DisableShuffleFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+            ?: throw DisableShuffleFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt
index 74a1215e..bd2cec28 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.compactheader.fingerprints.CompactHeaderConstructorFingerprint
@@ -19,7 +17,7 @@ import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction11x
 class CompactHeaderPatch : BytecodePatch(
     listOf(CompactHeaderConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val result = CompactHeaderConstructorFingerprint.result!!
         val method = result.mutableMethod
 
@@ -31,7 +29,5 @@ class CompactHeaderPatch : BytecodePatch(
                 invoke-virtual {v${register}, v2}, Landroid/view/View;->setVisibility(I)V
             """
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt
index 387e74bb..a1f0197e 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
@@ -18,14 +16,12 @@ import app.revanced.patches.music.layout.minimizedplayback.fingerprints.Minimize
 class MinimizedPlaybackPatch : BytecodePatch(
     listOf(MinimizedPlaybackManagerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstruction(
             0,
             """
                 return-void
             """
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt
index 1852409c..5a9f09b9 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumFingerprint
@@ -21,7 +19,7 @@ import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumPare
 class HideGetPremiumPatch : BytecodePatch(
     listOf(HideGetPremiumParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val parentResult = HideGetPremiumParentFingerprint.result!!
         HideGetPremiumFingerprint.resolve(context, parentResult.classDef)
 
@@ -43,7 +41,5 @@ class HideGetPremiumPatch : BytecodePatch(
                 const/16 v0, 0x8
             """
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt
index 2cf4fdb9..4a2f13c2 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.annotations.MusicCompatibility
@@ -24,7 +22,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 class RemoveUpgradeButtonPatch : BytecodePatch(
     listOf(PivotBarConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val result = PivotBarConstructorFingerprint.result!!
         val implementation = result.mutableMethod.implementation!!
 
@@ -69,6 +67,5 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
         implementation.addInstructions(
             endIndex, instructionList
         )
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt
index a59c1fc0..20f04817 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificateFingerprint
@@ -19,7 +17,7 @@ import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificate
 class BypassCertificateChecksPatch : BytecodePatch(
     listOf(CheckCertificateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         CheckCertificateFingerprint.result?.apply {
             mutableMethod.addInstructions(
                 0, """
@@ -27,8 +25,6 @@ class BypassCertificateChecksPatch : BytecodePatch(
                 return v0
                 """
             )
-        } ?: return CheckCertificateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw CheckCertificateFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MicroGBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
index 69567217..e15d2b56 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
@@ -4,7 +4,6 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
@@ -37,27 +36,25 @@ class MicroGBytecodePatch : BytecodePatch(
     // - "com.google.android.gms.phenotype.PACKAGE_NAME",
     // - "com.google.android.gms.phenotype.UPDATE",
     // - "com.google.android.gms.phenotype",
-    override fun execute(context: BytecodeContext) =
-        // apply common microG patch
-        MicroGBytecodeHelper.patchBytecode(
-            context,
-            arrayOf(
-                MicroGBytecodeHelper.packageNameTransform(
-                    Constants.PACKAGE_NAME,
-                    Constants.REVANCED_PACKAGE_NAME
-                )
-            ),
-            MicroGBytecodeHelper.PrimeMethodTransformationData(
-                PrimeFingerprint,
-                MUSIC_PACKAGE_NAME,
-                REVANCED_MUSIC_PACKAGE_NAME
-            ),
-            listOf(
-                ServiceCheckFingerprint,
-                GooglePlayUtilityFingerprint,
-                CastDynamiteModuleFingerprint,
-                CastDynamiteModuleV2Fingerprint,
-                CastContextFetchFingerprint
+    override fun execute(context: BytecodeContext) = MicroGBytecodeHelper.patchBytecode(
+        context,
+        arrayOf(
+            MicroGBytecodeHelper.packageNameTransform(
+                Constants.PACKAGE_NAME,
+                Constants.REVANCED_PACKAGE_NAME
             )
-        ).let { PatchResultSuccess() }
+        ),
+        MicroGBytecodeHelper.PrimeMethodTransformationData(
+            PrimeFingerprint,
+            MUSIC_PACKAGE_NAME,
+            REVANCED_MUSIC_PACKAGE_NAME
+        ),
+        listOf(
+            ServiceCheckFingerprint,
+            GooglePlayUtilityFingerprint,
+            CastDynamiteModuleFingerprint,
+            CastDynamiteModuleV2Fingerprint,
+            CastContextFetchFingerprint
+        )
+    )
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/resource/MicroGResourcePatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/resource/MicroGResourcePatch.kt
index 89dc28ee..bbcfcf4a 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/resource/MicroGResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/patch/resource/MicroGResourcePatch.kt
@@ -2,8 +2,6 @@ package app.revanced.patches.music.misc.microg.patch.resource
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
@@ -15,7 +13,7 @@ import app.revanced.util.microg.MicroGResourceHelper
 
 @Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
 class MicroGResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         // update manifest
         MicroGResourceHelper.patchManifest(
             context,
@@ -30,6 +28,5 @@ class MicroGResourcePatch : ResourcePatch {
             SPOOFED_PACKAGE_NAME,
             SPOOFED_PACKAGE_SIGNATURE
         )
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt b/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt
index a3404c44..3c9fbc06 100644
--- a/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.premium.backgroundplay.fingerprints.BackgroundPlaybackDisableFingerprint
@@ -18,7 +16,7 @@ import app.revanced.patches.music.premium.backgroundplay.fingerprints.Background
 class BackgroundPlayPatch : BytecodePatch(
     listOf(BackgroundPlaybackDisableFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
@@ -26,7 +24,5 @@ class BackgroundPlayPatch : BytecodePatch(
                 return v0
             """
         )
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/myexpenses/misc/pro/patch/UnlockProPatch.kt b/src/main/kotlin/app/revanced/patches/myexpenses/misc/pro/patch/UnlockProPatch.kt
index 83b4624b..ad60a41d 100644
--- a/src/main/kotlin/app/revanced/patches/myexpenses/misc/pro/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/myexpenses/misc/pro/patch/UnlockProPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.myexpenses.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.myexpenses.misc.pro.fingerprints.IsEnabledFingerprint
@@ -20,7 +18,7 @@ class UnlockProPatch : BytecodePatch(
         IsEnabledFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val method = IsEnabledFingerprint.result!!.mutableMethod
         method.addInstructions(
             0,
@@ -29,7 +27,5 @@ class UnlockProPatch : BytecodePatch(
                 return v0
             """
         )
-        
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/netguard/broadcasts/removerestriction/resource/patch/RemoveBroadcastsRestrictionPatch.kt b/src/main/kotlin/app/revanced/patches/netguard/broadcasts/removerestriction/resource/patch/RemoveBroadcastsRestrictionPatch.kt
index 8bd7f6b1..90f196a5 100644
--- a/src/main/kotlin/app/revanced/patches/netguard/broadcasts/removerestriction/resource/patch/RemoveBroadcastsRestrictionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/netguard/broadcasts/removerestriction/resource/patch/RemoveBroadcastsRestrictionPatch.kt
@@ -3,8 +3,6 @@ package app.revanced.patches.netguard.broadcasts.removerestriction.resource.patc
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.netguard.broadcasts.removerestriction.resource.annotations.RemoveBroadcastsRestrictionCompatibility
@@ -15,7 +13,7 @@ import org.w3c.dom.Element
 @Description("Enables starting/stopping NetGuard via broadcasts.")
 @RemoveBroadcastsRestrictionCompatibility
 class RemoveBroadcastsRestrictionPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         context.xmlEditor["AndroidManifest.xml"].use { dom ->
             val applicationNode = dom
                 .file
@@ -32,7 +30,5 @@ class RemoveBroadcastsRestrictionPatch : ResourcePatch {
                 }
             }
         }
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/nfctoolsse/misc/pro/patch/UnlockProPatch.kt b/src/main/kotlin/app/revanced/patches/nfctoolsse/misc/pro/patch/UnlockProPatch.kt
index 7e9ca260..210ec7ad 100644
--- a/src/main/kotlin/app/revanced/patches/nfctoolsse/misc/pro/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/nfctoolsse/misc/pro/patch/UnlockProPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.nfctoolsse.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.nfctoolsse.misc.pro.fingerprints.IsLicenseRegisteredFingerprint
@@ -22,7 +20,7 @@ class UnlockProPatch : BytecodePatch(
         IsLicenseRegisteredFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         IsLicenseRegisteredFingerprint.result?.mutableMethod?.apply {
             addInstructions(
                 0,
@@ -31,9 +29,7 @@ class UnlockProPatch : BytecodePatch(
                     return v0
                 """
             )
-        } ?: return IsLicenseRegisteredFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw IsLicenseRegisteredFingerprint.toErrorResult()
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/nyx/misc/pro/patch/UnlockProPatch.kt b/src/main/kotlin/app/revanced/patches/nyx/misc/pro/patch/UnlockProPatch.kt
index 3aebe830..130b5309 100644
--- a/src/main/kotlin/app/revanced/patches/nyx/misc/pro/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/nyx/misc/pro/patch/UnlockProPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.nyx.misc.pro.annotations.UnlockProCompatibility
 import app.revanced.patches.nyx.misc.pro.fingerprints.CheckProFingerprint
@@ -20,7 +18,7 @@ class UnlockProPatch : BytecodePatch(
         CheckProFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val method = CheckProFingerprint.result!!.mutableMethod
         method.addInstructions(
             0,
@@ -29,7 +27,5 @@ class UnlockProPatch : BytecodePatch(
                 return v0
             """
         )
-        
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt b/src/main/kotlin/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt
index 7a61dfce..9e8e08ef 100644
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/signature/patch/SignatureDetectionPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.photomath.detection.signature.fingerprints.CheckSignatureFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
@@ -17,15 +15,13 @@ class SignatureDetectionPatch : BytecodePatch(
         CheckSignatureFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         CheckSignatureFingerprint.result?.apply {
             val signatureCheckInstruction = mutableMethod.getInstruction(scanResult.patternScanResult!!.endIndex)
             val checkRegister = (signatureCheckInstruction as OneRegisterInstruction).registerA
 
             mutableMethod.replaceInstruction(signatureCheckInstruction.location.index, "const/4 v$checkRegister, 0x1")
         } ?: throw CheckSignatureFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
     }
 
 }
diff --git a/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt b/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt
index b0dc015b..893e9476 100644
--- a/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/misc/unlockplus/patch/UnlockPlusPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.photomath.detection.signature.patch.SignatureDetectionPatch
@@ -24,7 +22,7 @@ class UnlockPlusPatch : BytecodePatch(
         IsPlusUnlockedFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         IsPlusUnlockedFingerprint.result?.mutableMethod?.apply {
             addInstructions(
                 0,
@@ -33,9 +31,7 @@ class UnlockPlusPatch : BytecodePatch(
                     return v0
                 """
             )
-        } ?: return IsPlusUnlockedFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw IsPlusUnlockedFingerprint.toErrorResult()
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/pixiv/ads/patch/HideAdsPatch.kt b/src/main/kotlin/app/revanced/patches/pixiv/ads/patch/HideAdsPatch.kt
index d2d975aa..66d797f1 100644
--- a/src/main/kotlin/app/revanced/patches/pixiv/ads/patch/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/pixiv/ads/patch/HideAdsPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.pixiv.ads.fingerprints.IsNotPremiumFingerprint
 
@@ -15,7 +13,7 @@ import app.revanced.patches.pixiv.ads.fingerprints.IsNotPremiumFingerprint
 @Description("Hides ads.")
 @Compatibility([Package("jp.pxv.android")])
 class HideAdsPatch : BytecodePatch(listOf(IsNotPremiumFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // Always return false in the "isNotPremium" method which normally returns !this.accountManager.isPremium.
         // However, this is not the method that controls the user's premium status.
         // Instead, this method is used to determine whether ads should be shown.
@@ -25,8 +23,6 @@ class HideAdsPatch : BytecodePatch(listOf(IsNotPremiumFingerprint)) {
                 const/4 v0, 0x0
                 return v0
             """
-        ) ?: return IsNotPremiumFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw IsNotPremiumFingerprint.toErrorResult()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/reddit/ad/banner/patch/HideBannerPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/ad/banner/patch/HideBannerPatch.kt
index 11df0ede..e4fb8aa0 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/banner/patch/HideBannerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/banner/patch/HideBannerPatch.kt
@@ -3,14 +3,12 @@ package app.revanced.patches.reddit.ad.banner.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 
 @Name("Hide subreddit banner")
 @Description("Hides banner ads from comments on subreddits.")
 class HideBannerPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         context.xmlEditor[RESOURCE_FILE_PATH].use {
             it.file.getElementsByTagName("merge").item(0).childNodes.apply {
                 val attributes = arrayOf("height", "width")
@@ -30,8 +28,6 @@ class HideBannerPatch : ResourcePatch {
                 }
             }
         }
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/reddit/ad/comments/patch/HideCommentAdsPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/ad/comments/patch/HideCommentAdsPatch.kt
index 7c307e0b..372903e9 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/comments/patch/HideCommentAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/comments/patch/HideCommentAdsPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.ad.comments.fingerprints.HideCommentAdsFingerprint
 
 @Name("Hide comment ads")
@@ -14,7 +12,7 @@ import app.revanced.patches.reddit.ad.comments.fingerprints.HideCommentAdsFinger
 class HideCommentAdsPatch : BytecodePatch(
     listOf(HideCommentAdsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val method = HideCommentAdsFingerprint.result!!.mutableMethod
         // Returns a blank object instead of the comment ad.
         method.addInstructions(
@@ -25,6 +23,5 @@ class HideCommentAdsPatch : BytecodePatch(
             return-object v0
             """
         )
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt
index f594d9bf..4ad46583 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.annotations.RequiresIntegrations
@@ -31,7 +29,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 class HideAdsPatch : BytecodePatch(
     listOf(AdPostFingerprint, NewAdPostFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // region Filter promoted ads (does not work in popular or latest feed)
 
         AdPostFingerprint.result?.mutableMethod?.apply {
@@ -78,8 +76,6 @@ class HideAdsPatch : BytecodePatch(
         }
 
         // endregion
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt
index 93840b57..eb976004 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch.kt
@@ -5,7 +5,10 @@ import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.OptionsContainer
+import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.PatchOption
 import java.io.File
 
 abstract class AbstractSpoofClientPatch(
@@ -17,13 +20,13 @@ abstract class AbstractSpoofClientPatch(
     addAll(clientIdFingerprints)
     userAgentFingerprints?.let(::addAll)
 }) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         if (options.clientId == null) {
             // Ensure device runs Android.
             try {
                 Class.forName("android.os.Environment")
             } catch (e: ClassNotFoundException) {
-                return PatchResultError("No client ID provided")
+                throw PatchException("No client ID provided")
             }
 
             File(Environment.getExternalStorageDirectory(), "reddit_client_id_revanced.txt").also {
@@ -38,22 +41,16 @@ abstract class AbstractSpoofClientPatch(
                     The application type has to be "Installed app" and the redirect URI has to be set to "$redirectUri".
                 """.trimIndent()
 
-                return PatchResultError(error)
+                throw PatchException(error)
             }.let { options.clientId = it.readText().trim() }
         }
 
         fun List<MethodFingerprint>?.executePatch(
-            patch: List<MethodFingerprintResult>.(BytecodeContext) -> PatchResult
-        ) {
-            when (val result = this?.map { it.result ?: throw it.toErrorResult() }?.patch(context)) {
-                is PatchResultError -> throw result
-            }
-        }
+            patch: List<MethodFingerprintResult>.(BytecodeContext) -> Unit
+        ) = this?.map { it.result ?: throw it.toErrorResult() }?.patch(context)
 
         clientIdFingerprints.executePatch { patchClientId(context) }
         userAgentFingerprints.executePatch { patchUserAgent(context) }
-
-        return PatchResultSuccess()
     }
 
     /**
@@ -62,7 +59,7 @@ abstract class AbstractSpoofClientPatch(
      * @param context The current [BytecodeContext].
      *
      */
-    abstract fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult
+    abstract fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext)
 
     /**
      * Patch the user agent. The fingerprints are guaranteed to be in the same order as in [userAgentFingerprints].
@@ -70,8 +67,7 @@ abstract class AbstractSpoofClientPatch(
      * @param context The current [BytecodeContext].
      */
     // Not every client needs to patch the user agent.
-    open fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext): PatchResult =
-        PatchResultSuccess()
+    open fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {}
 
     companion object Options {
         open class SpoofClientOptionsContainer : OptionsContainer() {
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/patch/SpoofClientPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/patch/SpoofClientPatch.kt
index 40365bb6..18f2a953 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/baconreader/api/patch/SpoofClientPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.baconreader.api.fingerprints.GetAuthorizationUrlFingerprint
@@ -30,7 +28,7 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
     "http://baconreader.com/auth", Options, listOf(GetAuthorizationUrlFingerprint, RequestTokenFingerprint)
 ) {
 
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
         fun MethodFingerprintResult.patch(replacementString: String) {
             val clientIdIndex = scanResult.stringsScanResult!!.matches.first().index
 
@@ -48,8 +46,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
 
         // Patch client id for access token request.
         last().patch(clientId!!)
-
-        return PatchResultSuccess()
     }
 
     companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/patch/SpoofClientPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/patch/SpoofClientPatch.kt
index 1f721e55..52bef851 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/patch/SpoofClientPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint
@@ -20,7 +18,7 @@ import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints
 class SpoofClientPatch : AbstractSpoofClientPatch(
     "http://rubenmayayo.com", Options, listOf(GetClientIdFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
         first().mutableMethod.addInstructions(
             0,
             """
@@ -28,8 +26,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                  return-object v0
             """
         )
-
-        return PatchResultSuccess()
     }
 
     companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/patch/SpoofClientPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/patch/SpoofClientPatch.kt
index b1770918..180ff893 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/api/patch/SpoofClientPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.GetHttpBasicAuthHeaderFingerprint
@@ -25,7 +23,7 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
     Options,
     listOf(GetHttpBasicAuthHeaderFingerprint, LoginActivityOnCreateFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
         forEach {
             val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
             it.mutableMethod.apply {
@@ -37,8 +35,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                 )
             }
         }
-
-        return PatchResultSuccess()
     }
 
     companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/ads/patch/DisableAdsPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/ads/patch/DisableAdsPatch.kt
index 7b0c565d..46735d20 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/ads/patch/DisableAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/ads/patch/DisableAdsPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.joeyforreddit.ads.fingerprints.IsAdFreeUserFingerprint
@@ -19,15 +17,13 @@ import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.
 @DependsOn([DisablePiracyDetectionPatch::class])
 @Compatibility([Package("o.o.joey")])
 class DisableAdsPatch : BytecodePatch(listOf(IsAdFreeUserFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         IsAdFreeUserFingerprint.result?.mutableMethod?.addInstructions(
             0,
             """
                 const/4 v0, 0x1
                 return v0
             """
-        ) ?: return IsAdFreeUserFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw IsAdFreeUserFingerprint.toErrorResult()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/api/patch/SpoofClientPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/api/patch/SpoofClientPatch.kt
index 8bd8ce6d..a147e0e1 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/api/patch/SpoofClientPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
@@ -31,7 +29,7 @@ import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.
 class SpoofClientPatch : AbstractSpoofClientPatch(
     "https://127.0.0.1:65023/authorize_callback", Options, listOf(GetClientIdFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
         first().mutableMethod.addInstructions(
             0,
             """
@@ -39,8 +37,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                 return-object v0
             """
         )
-
-        return PatchResultSuccess()
     }
 
     companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
index b2935fa8..3af32e15 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
@@ -4,19 +4,15 @@ import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.joeyforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint
 
 class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         PiracyDetectionFingerprint.result?.mutableMethod?.addInstruction(
             0,
             """
                 return-void
             """
-        ) ?: return PiracyDetectionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw PiracyDetectionFingerprint.toErrorResult()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/patch/SpoofClientPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/patch/SpoofClientPatch.kt
index 1c166b13..386c5da6 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/patch/SpoofClientPatch.kt
@@ -9,8 +9,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult.MethodFingerprintScanResult.StringsScanResult.StringMatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.redditisfun.api.fingerprints.BasicAuthorizationFingerprint
@@ -29,7 +27,7 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
     listOf(BuildAuthorizationStringFingerprint, BasicAuthorizationFingerprint),
     listOf(GetUserAgentFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
         /**
          * Replaces a one register instruction with a const-string instruction
          * at the index returned by [getReplacementIndex].
@@ -53,11 +51,9 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
 
         // Path basic authorization.
         last().replaceWith("$clientId:") { last().index + 7 }
-
-        return PatchResultSuccess()
     }
 
-    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
         // Use a random user agent.
         val randomName = (0..100000).random()
         val userAgent = "android:app.revanced.$randomName:v1.0.0 (by /u/revanced)"
@@ -69,8 +65,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                 return-object v0
             """
         )
-
-        return PatchResultSuccess()
     }
 
     companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/patch/SpoofClientPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/patch/SpoofClientPatch.kt
index d1d07ae5..f4f6869e 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/relayforreddit/api/patch/SpoofClientPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetLoggedInBearerTokenFingerprint
@@ -32,7 +30,7 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
         GetRefreshTokenFingerprint
     )
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
         forEach {
             val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
             it.mutableMethod.apply {
@@ -44,8 +42,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                 )
             }
         }
-
-        return PatchResultSuccess()
     }
 
     companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/patch/SpoofClientPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/patch/SpoofClientPatch.kt
index b2182916..5c187cb2 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/slide/api/patch/SpoofClientPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
 import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint
@@ -20,7 +18,7 @@ import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints
 class SpoofClientPatch : AbstractSpoofClientPatch(
     "http://www.ccrama.me", Options, listOf(GetClientIdFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
         first().mutableMethod.addInstructions(
             0,
     """
@@ -28,8 +26,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                      return-object v0
                 """
         )
-
-        return PatchResultSuccess()
     }
 
     companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/ads/patch/DisableAdsPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/ads/patch/DisableAdsPatch.kt
index 367ca8f9..edc876f4 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/ads/patch/DisableAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/ads/patch/DisableAdsPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.syncforreddit.ads.fingerprints.IsAdsEnabledFingerprint
@@ -17,7 +15,7 @@ import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.
 @DependsOn([DisablePiracyDetectionPatch::class])
 @Compatibility([Package("com.laurencedawson.reddit_sync")])
 class DisableAdsPatch : BytecodePatch(listOf(IsAdsEnabledFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         IsAdsEnabledFingerprint.result?.mutableMethod?.apply {
             addInstructions(
                 0,
@@ -26,9 +24,7 @@ class DisableAdsPatch : BytecodePatch(listOf(IsAdsEnabledFingerprint)) {
                 return v0
             """
             )
-        } ?: return IsAdsEnabledFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw IsAdsEnabledFingerprint.toErrorResult()
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/patch/DisableSyncForLemmyBottomSheetPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/patch/DisableSyncForLemmyBottomSheetPatch.kt
index e47e6ea0..41bc706b 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/patch/DisableSyncForLemmyBottomSheetPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/annoyances/startup/patch/DisableSyncForLemmyBottomSheetPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.syncforreddit.annoyances.startup.fingerprints.MainActivityOnCreate
 
@@ -23,13 +21,11 @@ import app.revanced.patches.reddit.customclients.syncforreddit.annoyances.startu
     ]
 )
 class DisableSyncForLemmyBottomSheetPatch : BytecodePatch(listOf(MainActivityOnCreate)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         MainActivityOnCreate.result?.mutableMethod?.apply {
             val showBottomSheetIndex = implementation!!.instructions.lastIndex - 1
 
             removeInstruction(showBottomSheetIndex)
         }
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/patch/SpoofClientPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/patch/SpoofClientPatch.kt
index 63380ea5..7ed9dbb5 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/patch/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/patch/SpoofClientPatch.kt
@@ -10,8 +10,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
 import app.revanced.patches.reddit.customclients.SpoofClientAnnotation
@@ -38,7 +36,7 @@ import java.util.*
 class SpoofClientPatch : AbstractSpoofClientPatch(
     "http://redditsync/auth", Options, listOf(GetAuthorizationStringFingerprint)
 ) {
-    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext): PatchResult {
+    override fun List<MethodFingerprintResult>.patchClientId(context: BytecodeContext) {
         forEach { fingerprintResult ->
             fingerprintResult.also { result ->
                 GetBearerTokenFingerprint.also { it.resolve(context, result.classDef) }.result?.mutableMethod?.apply {
@@ -50,7 +48,7 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                          return-object v0
                     """
                     )
-                } ?: return GetBearerTokenFingerprint.toErrorResult()
+                } ?: throw GetBearerTokenFingerprint.toErrorResult()
             }.let {
                 val occurrenceIndex = it.scanResult.stringsScanResult!!.matches.first().index
 
@@ -71,8 +69,6 @@ class SpoofClientPatch : AbstractSpoofClientPatch(
                 }
             }
         }
-
-        return PatchResultSuccess()
     }
 
     companion object Options : AbstractSpoofClientPatch.Options.SpoofClientOptionsContainer()
diff --git a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
index f0d73060..5ce7fb0b 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/patch/DisablePiracyDetectionPatch.kt
@@ -4,13 +4,11 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.fingerprints.PiracyDetectionFingerprint
 
 @Description("Disables detection of modified versions.")
 class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // Do not return an error if the fingerprint is not resolved.
         // This is fine because new versions of the target app do not need this patch.
         PiracyDetectionFingerprint.result?.mutableMethod?.apply {
@@ -21,7 +19,5 @@ class DisablePiracyDetectionPatch : BytecodePatch(listOf(PiracyDetectionFingerpr
                 """
             )
         }
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/patch/DisableScreenshotPopupPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/patch/DisableScreenshotPopupPatch.kt
index 740252f2..efb9a20a 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/patch/DisableScreenshotPopupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/disablescreenshotpopup/patch/DisableScreenshotPopupPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.layout.disablescreenshotpopup.annotations.DisableScreenshotPopupCompatibility
 import app.revanced.patches.reddit.layout.disablescreenshotpopup.fingerprints.DisableScreenshotPopupFingerprint
@@ -19,10 +17,8 @@ import app.revanced.patches.reddit.layout.disablescreenshotpopup.fingerprints.Di
 class DisableScreenshotPopupPatch : BytecodePatch(
     listOf(DisableScreenshotPopupFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         DisableScreenshotPopupFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
-            ?: return DisableScreenshotPopupFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+            ?: throw DisableScreenshotPopupFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt
index 8233d811..6f4c62a1 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCompatibility
 import app.revanced.patches.reddit.layout.premiumicon.fingerprints.PremiumIconFingerprint
@@ -20,7 +18,7 @@ class PremiumIconPatch : BytecodePatch(
         PremiumIconFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val method = PremiumIconFingerprint.result!!.mutableMethod
         method.addInstructions(
             0,
@@ -29,6 +27,5 @@ class PremiumIconPatch : BytecodePatch(
                 return v0
             """
         )
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/patch/SanitizeUrlQueryPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/patch/SanitizeUrlQueryPatch.kt
index cb1735b8..1d5312fc 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/patch/SanitizeUrlQueryPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/patch/SanitizeUrlQueryPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.misc.tracking.url.annotations.SanitizeUrlQueryCompatibility
 import app.revanced.patches.reddit.misc.tracking.url.fingerprints.ShareLinkFormatterFingerprint
@@ -19,14 +17,12 @@ import app.revanced.patches.reddit.misc.tracking.url.fingerprints.ShareLinkForma
 class SanitizeUrlQueryPatch : BytecodePatch(
     listOf(ShareLinkFormatterFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         ShareLinkFormatterFingerprint.result?.mutableMethod?.addInstructions(
             0,
             "return-object p0"
-        ) ?: return ShareLinkFormatterFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        ) ?: throw ShareLinkFormatterFingerprint.toErrorResult()
     }
 
 }
diff --git a/src/main/kotlin/app/revanced/patches/scbeasy/detection/debugging/patch/RemoveDebuggingDetectionPatch.kt b/src/main/kotlin/app/revanced/patches/scbeasy/detection/debugging/patch/RemoveDebuggingDetectionPatch.kt
index 026b3155..387caf2d 100644
--- a/src/main/kotlin/app/revanced/patches/scbeasy/detection/debugging/patch/RemoveDebuggingDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/scbeasy/detection/debugging/patch/RemoveDebuggingDetectionPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.scbeasy.detection.debugging.annotations.RemoveDebuggingDetectionCompatibility
 import app.revanced.patches.scbeasy.detection.debugging.fingerprints.DebuggingDetectionFingerprint
@@ -18,7 +16,7 @@ import app.revanced.patches.scbeasy.detection.debugging.fingerprints.DebuggingDe
 class RemoveDebuggingDetectionPatch : BytecodePatch(
     listOf(DebuggingDetectionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         DebuggingDetectionFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
@@ -26,6 +24,5 @@ class RemoveDebuggingDetectionPatch : BytecodePatch(
                 return v0
             """
         )
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/shared/integrations/patch/AbstractIntegrationsPatch.kt b/src/main/kotlin/app/revanced/patches/shared/integrations/patch/AbstractIntegrationsPatch.kt
index 2baf5399..378cfc30 100644
--- a/src/main/kotlin/app/revanced/patches/shared/integrations/patch/AbstractIntegrationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/integrations/patch/AbstractIntegrationsPatch.kt
@@ -5,9 +5,7 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patches.shared.integrations.patch.AbstractIntegrationsPatch.IntegrationsFingerprint.RegisterResolver
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.ClassDef
@@ -40,7 +38,7 @@ abstract class AbstractIntegrationsPatch(
         strings,
         customFingerprint
     ) {
-        fun invoke(integrationsDescriptor: String): PatchResult {
+        fun invoke(integrationsDescriptor: String) {
             result?.mutableMethod?.let { method ->
                 val contextRegister = contextRegisterResolver(method)
 
@@ -49,9 +47,7 @@ abstract class AbstractIntegrationsPatch(
                     "sput-object v$contextRegister, " +
                             "$integrationsDescriptor->context:Landroid/content/Context;"
                 )
-            } ?: return PatchResultError("Could not find hook target fingerprint.")
-
-            return PatchResultSuccess()
+            } ?: throw PatchException("Could not find hook target fingerprint.")
         }
 
         interface RegisterResolver : (Method) -> Int {
@@ -59,20 +55,11 @@ abstract class AbstractIntegrationsPatch(
         }
     }
 
-    override fun execute(context: BytecodeContext): PatchResult {
-        if (context.findClass(integrationsDescriptor) == null) return MISSING_INTEGRATIONS
-
-        for (hook in hooks) hook.invoke(integrationsDescriptor).let {
-            if (it is PatchResultError) return it
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        val MISSING_INTEGRATIONS = PatchResultError(
-            "Integrations have not been merged yet. " +
-                    "This patch can not succeed without merging the integrations."
+    override fun execute(context: BytecodeContext) {
+        if (context.findClass(integrationsDescriptor) == null) throw PatchException(
+            "Integrations have not been merged yet. This patch can not succeed without merging the integrations."
         )
+
+        for (hook in hooks) hook.invoke(integrationsDescriptor)
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/shared/mapping/misc/patch/ResourceMappingPatch.kt b/src/main/kotlin/app/revanced/patches/shared/mapping/misc/patch/ResourceMappingPatch.kt
index ea00c783..62d1043c 100644
--- a/src/main/kotlin/app/revanced/patches/shared/mapping/misc/patch/ResourceMappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/mapping/misc/patch/ResourceMappingPatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.shared.mapping.misc.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import org.w3c.dom.Element
 import java.util.*
@@ -19,7 +17,7 @@ class ResourceMappingPatch : ResourcePatch {
         private val threadPoolExecutor = Executors.newFixedThreadPool(THREAD_COUNT)
     }
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         // save the file in memory to concurrently read from
         val resourceXmlFile = context["res/values/public.xml"].readBytes()
 
@@ -59,8 +57,6 @@ class ResourceMappingPatch : ResourcePatch {
             .awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS)
 
         resourceMappings = mappings
-
-        return PatchResultSuccess()
     }
 }
 
diff --git a/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt b/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt
index de8cdde1..5c32a518 100644
--- a/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.shared.misc.fix.verticalscroll.annotations.VerticalScrollCompatibility
 import app.revanced.patches.shared.misc.fix.verticalscroll.fingerprints.CanScrollVerticallyFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@@ -17,7 +15,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class VerticalScrollPatch : BytecodePatch(
     listOf(CanScrollVerticallyFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         CanScrollVerticallyFingerprint.result?.let {
             it.mutableMethod.apply {
                 val moveResultIndex = it.scanResult.patternScanResult!!.endIndex
@@ -29,8 +27,6 @@ class VerticalScrollPatch : BytecodePatch(
                     "const/4 v$moveResultRegister, 0x0"
                 )
             }
-        } ?: return CanScrollVerticallyFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw CanScrollVerticallyFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt
index a86ed1be..3819be0d 100644
--- a/src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/settings/resource/patch/AbstractSettingsResourcePatch.kt
@@ -1,10 +1,8 @@
 package app.revanced.patches.shared.settings.resource.patch
 
-import app.revanced.patcher.data.DomFileEditor
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patches.shared.settings.preference.BasePreference
 import app.revanced.patches.shared.settings.preference.BaseResource
 import app.revanced.patches.shared.settings.preference.addPreference
@@ -26,7 +24,7 @@ abstract class AbstractSettingsResourcePatch(
     private val preferenceFileName: String,
     private val sourceDirectory: String,
 ) : ResourcePatch, Closeable {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         /*
          * used for self-restart
          * TODO: do this only, when necessary
@@ -51,8 +49,6 @@ abstract class AbstractSettingsResourcePatch(
         stringsEditor = context.xmlEditor["res/values/strings.xml"]
         arraysEditor = context.xmlEditor["res/values/arrays.xml"]
         revancedPreferencesEditor = context.xmlEditor["res/xml/$preferenceFileName.xml"]
-
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/songpal/badge/patch/BadgeTabPatch.kt b/src/main/kotlin/app/revanced/patches/songpal/badge/patch/BadgeTabPatch.kt
index d4f7ffbd..28fa2ef1 100644
--- a/src/main/kotlin/app/revanced/patches/songpal/badge/patch/BadgeTabPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/songpal/badge/patch/BadgeTabPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.songpal.badge.annotations.BadgeCompatibility
 import app.revanced.patches.songpal.badge.fingerprints.CreateTabsFingerprint
@@ -20,7 +18,7 @@ import app.revanced.patches.songpal.badge.fingerprints.CreateTabsFingerprint
 class BadgeTabPatch : BytecodePatch(
     listOf(CreateTabsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         CreateTabsFingerprint.result?.mutableMethod?.apply {
             removeInstructions(0, 2)
 
@@ -52,9 +50,7 @@ class BadgeTabPatch : BytecodePatch(
                  """
             )
 
-        } ?: return CreateTabsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw CreateTabsFingerprint.toErrorResult()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/songpal/badge/patch/RemoveNotificationBadgePatch.kt b/src/main/kotlin/app/revanced/patches/songpal/badge/patch/RemoveNotificationBadgePatch.kt
index 59f626eb..73e43586 100644
--- a/src/main/kotlin/app/revanced/patches/songpal/badge/patch/RemoveNotificationBadgePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/songpal/badge/patch/RemoveNotificationBadgePatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.songpal.badge.annotations.BadgeCompatibility
 import app.revanced.patches.songpal.badge.fingerprints.ShowNotificationFingerprint
@@ -19,11 +17,9 @@ import app.revanced.patches.songpal.badge.fingerprints.ShowNotificationFingerpri
 class RemoveNotificationBadgePatch : BytecodePatch(
     listOf(ShowNotificationFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShowNotificationFingerprint.result?.mutableMethod?.apply {
             addInstructions(0, "return-void")
-        } ?: return ShowNotificationFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw ShowNotificationFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/spotify/layout/theme/patch/ThemePatch.kt b/src/main/kotlin/app/revanced/patches/spotify/layout/theme/patch/ThemePatch.kt
index 356a2d9e..c90b93ff 100644
--- a/src/main/kotlin/app/revanced/patches/spotify/layout/theme/patch/ThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/layout/theme/patch/ThemePatch.kt
@@ -3,7 +3,9 @@ package app.revanced.patches.spotify.layout.theme.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.OptionsContainer
+import app.revanced.patcher.patch.PatchOption
+import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.spotify.layout.theme.annotations.ThemeCompatibility
 import org.w3c.dom.Element
@@ -13,7 +15,7 @@ import org.w3c.dom.Element
 @Description("Applies a custom theme.")
 @ThemeCompatibility
 class ThemePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         context.xmlEditor["res/values/colors.xml"].use { editor ->
             val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
 
@@ -28,8 +30,6 @@ class ThemePatch : ResourcePatch {
                 }
             }
         }
-
-        return PatchResultSuccess()
     }
 
     companion object : OptionsContainer() {
diff --git a/src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/patch/OnDemandPatch.kt b/src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/patch/OnDemandPatch.kt
index 0ee130df..3b1342f9 100644
--- a/src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/patch/OnDemandPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/lite/ondemand/patch/OnDemandPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.spotify.lite.ondemand.annotations.OnDemandCompatibility
 import app.revanced.patches.spotify.lite.ondemand.fingerprints.OnDemandFingerprint
@@ -21,12 +19,11 @@ class OnDemandPatch : BytecodePatch(
         OnDemandFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         OnDemandFingerprint.result?.apply {
             val insertIndex = scanResult.patternScanResult!!.endIndex - 1
             // Spoof a premium account
             mutableMethod.addInstruction(insertIndex, "const/4 v0, 0x2")
-        } ?: return OnDemandFingerprint.toErrorResult()
-        return PatchResultSuccess()
+        } ?: throw OnDemandFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt
index 9383029a..a8126057 100644
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
@@ -27,7 +25,7 @@ class PremiumNavbarTabPatch : BytecodePatch(
         AddPremiumNavbarTabParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val parentResult = AddPremiumNavbarTabParentFingerprint.result!!
         AddPremiumNavbarTabFingerprint.resolve(context, parentResult.classDef)
 
@@ -55,7 +53,5 @@ class PremiumNavbarTabPatch : BytecodePatch(
 
             if (--removeAmount == 0) break
         }
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/patch/UnlockThemePatch.kt b/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/patch/UnlockThemePatch.kt
index c7e5023e..e7ff2319 100644
--- a/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/patch/UnlockThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/ticktick/misc/themeunlock/patch/UnlockThemePatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.ticktick.misc.themeunlock.annotations.UnlockThemesCompatibility
 import app.revanced.patches.ticktick.misc.themeunlock.fingerprints.CheckLockedThemesFingerprint
@@ -23,7 +21,7 @@ class UnlockProPatch : BytecodePatch(
         SetThemeFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val lockedThemesMethod = CheckLockedThemesFingerprint.result!!.mutableMethod
         lockedThemesMethod.addInstructions(
             0,
@@ -35,7 +33,5 @@ class UnlockProPatch : BytecodePatch(
         
         val setThemeMethod = SetThemeFingerprint.result!!.mutableMethod
         setThemeMethod.removeInstructions(0, 10)
-        
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/tiktok/ad/patch/HideAdsPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/ad/patch/HideAdsPatch.kt
index 194f20d6..975672dc 100644
--- a/src/main/kotlin/app/revanced/patches/tiktok/ad/patch/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/patch/HideAdsPatch.kt
@@ -5,9 +5,7 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.tiktok.ad.annotations.HideAdsCompatibility
 import app.revanced.patches.tiktok.ad.fingerprints.ConvertHelpFeedItemListFingerprint
@@ -27,7 +25,7 @@ class HideAdsPatch : BytecodePatch(
         ConvertHelpFeedItemListFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         listOf(
             FeedItemListCloneFingerprint,
             ConvertHelpFeedItemListFingerprint
@@ -48,8 +46,7 @@ class HideAdsPatch : BytecodePatch(
                 )
                 return@forEach
             }
-            return PatchResultError("Can not find required instruction.")
+            throw PatchException("Can not find required instruction.")
         }
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/patch/FeedFilterPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/patch/FeedFilterPatch.kt
index bc8f1329..d75b5032 100644
--- a/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/patch/FeedFilterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/patch/FeedFilterPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.tiktok.feedfilter.annotations.FeedFilterCompatibility
@@ -28,7 +26,7 @@ class FeedFilterPatch : BytecodePatch(
         SettingsStatusLoadFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val method = FeedApiServiceLIZFingerprint.result!!.mutableMethod
         for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
             if (instruction.opcode != Opcode.RETURN_OBJECT) continue
@@ -44,6 +42,5 @@ class FeedFilterPatch : BytecodePatch(
             0,
             "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableFeedFilter()V"
         )
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
index 95147aee..50d954ab 100644
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
@@ -3,16 +3,13 @@ package app.revanced.patches.tiktok.interaction.downloads.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -43,7 +40,7 @@ class DownloadsPatch : BytecodePatch(
         SettingsStatusLoadFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val method1 = ACLCommonShareFingerprint.result!!.mutableMethod
         method1.replaceInstructions(
             0,
@@ -89,7 +86,7 @@ class DownloadsPatch : BytecodePatch(
             targetOffset = index + 1
             break
         }
-        if (targetOffset == -1) return PatchResultError("Can not find download path uri method.")
+        if (targetOffset == -1) throw PatchException("Can not find download path uri method.")
         //Change videos' download path.
         val downloadUriMethod = context
             .toMethodWalker(DownloadPathParentFingerprint.result!!.method)
@@ -125,6 +122,5 @@ class DownloadsPatch : BytecodePatch(
             0,
             "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableDownload()V"
         )
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/patch/ShowSeekbarPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/patch/ShowSeekbarPatch.kt
index 713d4557..94e0bc11 100644
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/patch/ShowSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/patch/ShowSeekbarPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.tiktok.interaction.seekbar.annotations.ShowSeekbarCompatibility
 import app.revanced.patches.tiktok.interaction.seekbar.fingerprints.SetSeekBarShowTypeFingerprint
@@ -23,7 +21,7 @@ class ShowSeekbarPatch : BytecodePatch(
         ShouldShowSeekBarFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShouldShowSeekBarFingerprint.result?.mutableMethod?.apply {
             addInstructions(
                 0,
@@ -42,8 +40,7 @@ class ShowSeekbarPatch : BytecodePatch(
                     const/16 v$typeRegister, 0x64
                 """
             )
-        } ?: return SetSeekBarShowTypeFingerprint.toErrorResult()
-        return PatchResultSuccess()
+        } ?: throw SetSeekBarShowTypeFingerprint.toErrorResult()
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/patch/PlaybackSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/patch/PlaybackSpeedPatch.kt
index dcbdb9dc..8e0fb527 100644
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/patch/PlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/patch/PlaybackSpeedPatch.kt
@@ -3,11 +3,8 @@ package app.revanced.patches.tiktok.interaction.speed.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.tiktok.interaction.speed.annotations.PlaybackSpeedCompatibility
@@ -23,7 +20,7 @@ class PlaybackSpeedPatch : BytecodePatch(
         SpeedControlParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val parentMethod = SpeedControlParentFingerprint.result!!.mutableMethod
         val parentMethodInstructions = parentMethod.implementation!!.instructions
         for ((index, instruction) in parentMethodInstructions.withIndex()) {
@@ -41,6 +38,5 @@ class PlaybackSpeedPatch : BytecodePatch(
             )
             break
         }
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/tiktok/misc/login/disablerequirement/patch/DisableLoginRequirementPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/misc/login/disablerequirement/patch/DisableLoginRequirementPatch.kt
index 51c02a32..c34ead15 100644
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/login/disablerequirement/patch/DisableLoginRequirementPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/login/disablerequirement/patch/DisableLoginRequirementPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.tiktok.misc.login.disablerequirement.annotations.DisableLoginRequirementCompatibility
 import app.revanced.patches.tiktok.misc.login.disablerequirement.fingerprints.MandatoryLoginServiceFingerprint
@@ -22,7 +20,7 @@ class DisableLoginRequirementPatch : BytecodePatch(
         MandatoryLoginServiceFingerprint2
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         listOf(
             MandatoryLoginServiceFingerprint,
             MandatoryLoginServiceFingerprint2
@@ -36,6 +34,5 @@ class DisableLoginRequirementPatch : BytecodePatch(
             """
             )
         }
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/tiktok/misc/login/fixgoogle/patch/FixGoogleLoginPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/misc/login/fixgoogle/patch/FixGoogleLoginPatch.kt
index c1f31787..d6916bad 100644
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/login/fixgoogle/patch/FixGoogleLoginPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/login/fixgoogle/patch/FixGoogleLoginPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.tiktok.misc.login.fixgoogle.annotations.FixGoogleLoginCompatibility
 import app.revanced.patches.tiktok.misc.login.fixgoogle.fingerprints.GoogleAuthAvailableFingerprint
@@ -22,7 +20,7 @@ class FixGoogleLoginPatch : BytecodePatch(
         GoogleAuthAvailableFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         listOf(
             GoogleOneTapAuthAvailableFingerprint,
             GoogleAuthAvailableFingerprint
@@ -37,6 +35,5 @@ class FixGoogleLoginPatch : BytecodePatch(
                 )
             }
         }
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt
index def70142..0bdf374a 100644
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -33,12 +31,12 @@ class SettingsPatch : BytecodePatch(
         SettingsEntryInfoFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // Find the class name of classes which construct a settings entry
         val settingsButtonClass = SettingsEntryFingerprint.result?.classDef?.type?.toClassName()
-            ?: return SettingsEntryFingerprint.toErrorResult()
+            ?: throw SettingsEntryFingerprint.toErrorResult()
         val settingsButtonInfoClass = SettingsEntryInfoFingerprint.result?.classDef?.type?.toClassName()
-            ?: return SettingsEntryInfoFingerprint.toErrorResult()
+            ?: throw SettingsEntryInfoFingerprint.toErrorResult()
 
         // Create a settings entry for 'revanced settings' and add it to settings fragment
         AddSettingsEntryFingerprint.result?.apply {
@@ -66,7 +64,7 @@ class SettingsPatch : BytecodePatch(
                     """
                 )
             }
-        } ?: return AddSettingsEntryFingerprint.toErrorResult()
+        } ?: throw AddSettingsEntryFingerprint.toErrorResult()
 
         // Initialize the settings menu once the replaced setting entry is clicked.
         AdPersonalizationActivityOnCreateFingerprint.result?.mutableMethod?.apply {
@@ -87,9 +85,7 @@ class SettingsPatch : BytecodePatch(
                 """,
                 ExternalLabel("notrevanced", getInstruction(initializeSettingsIndex))
             )
-        } ?: return AdPersonalizationActivityOnCreateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw AdPersonalizationActivityOnCreateFingerprint.toErrorResult()
     }
 
     private fun String.toClassName(): String {
diff --git a/src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt
index 99b1b772..3227faf1 100644
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -39,7 +37,7 @@ class SpoofSimPatch : BytecodePatch() {
         )
     }
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // Find all api call to check sim information
         buildMap {
             context.classes.forEach { classDef ->
@@ -89,8 +87,6 @@ class SpoofSimPatch : BytecodePatch() {
                 "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableSimSpoof()V"
             )
         }
-
-        return PatchResultSuccess()
     }
 
     // Patch Android API and return fake sim information
diff --git a/src/main/kotlin/app/revanced/patches/trakt/patch/UnlockProPatch.kt b/src/main/kotlin/app/revanced/patches/trakt/patch/UnlockProPatch.kt
index d1856352..e7395674 100644
--- a/src/main/kotlin/app/revanced/patches/trakt/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/trakt/patch/UnlockProPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.trakt.annotations.UnlockProCompatibility
 import app.revanced.patches.trakt.fingerprints.IsVIPEPFingerprint
@@ -22,7 +20,7 @@ import app.revanced.patches.trakt.fingerprints.RemoteUserFingerprint
 class UnlockProPatch : BytecodePatch(
     listOf(RemoteUserFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         RemoteUserFingerprint.result?.classDef?.let { remoteUserClass ->
             arrayOf(IsVIPFingerprint, IsVIPEPFingerprint).onEach { fingerprint ->
                 // Resolve both fingerprints on the same class.
@@ -31,11 +29,9 @@ class UnlockProPatch : BytecodePatch(
             }.forEach { fingerprint ->
                 // Return true for both VIP check methods.
                 fingerprint.result?.mutableMethod?.addInstructions(0, RETURN_TRUE_INSTRUCTIONS)
-                    ?: return fingerprint.toErrorResult()
+                    ?: throw fingerprint.toErrorResult()
             }
-        } ?: return RemoteUserFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw RemoteUserFingerprint.toErrorResult()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/patch/UnlockPaidWidgetsPatch.kt b/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/patch/UnlockPaidWidgetsPatch.kt
index 715eba43..20b35c14 100644
--- a/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/patch/UnlockPaidWidgetsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twelvewidgets/unlock/patch/UnlockPaidWidgetsPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.twelvewidgets.unlock.fingerprints.*
 
@@ -25,7 +23,7 @@ class UnlockPaidWidgetsPatch : BytecodePatch(
         WeatherWidgetUnlockFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         listOf(
             AgendaDaysWidgetUnlockFingerprint,
             CalendarBigWidgetUnlockFingerprint,
@@ -34,7 +32,7 @@ class UnlockPaidWidgetsPatch : BytecodePatch(
             ScreentimeSmallWidgetUnlockFingerprint,
             WeatherWidgetUnlockFingerprint
         ).map { fingerprint ->
-            fingerprint.result?.mutableMethod ?: return fingerprint.toErrorResult()
+            fingerprint.result?.mutableMethod ?: throw fingerprint.toErrorResult()
         }.forEach { method ->
             method.apply {
                 removeInstructions(4, 3)
@@ -48,7 +46,5 @@ class UnlockPaidWidgetsPatch : BytecodePatch(
                 )
             }
         }
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/twitch/ad/audio/patch/AudioAdsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/ad/audio/patch/AudioAdsPatch.kt
index c9f22061..79c8539d 100644
--- a/src/main/kotlin/app/revanced/patches/twitch/ad/audio/patch/AudioAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/ad/audio/patch/AudioAdsPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -26,7 +24,7 @@ import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
 class AudioAdsPatch : BytecodePatch(
     listOf(AudioAdsPresenterPlayFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // Block playAds call
         with(AudioAdsPresenterPlayFingerprint.result!!) {
             mutableMethod.addInstructionsWithLabels(
@@ -59,7 +57,5 @@ class AudioAdsPatch : BytecodePatch(
                 default = true,
             )
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/patch/EmbeddedAdsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/patch/EmbeddedAdsPatch.kt
index 1c61a7ad..bc586883 100644
--- a/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/patch/EmbeddedAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/patch/EmbeddedAdsPatch.kt
@@ -6,9 +6,7 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.ArrayResource
@@ -28,8 +26,8 @@ import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
 class EmbeddedAdsPatch : BytecodePatch(
     listOf(CreateUsherClientFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val result = CreateUsherClientFingerprint.result ?: return PatchResultError("${CreateUsherClientFingerprint.name} not found")
+    override fun execute(context: BytecodeContext) {
+        val result = CreateUsherClientFingerprint.result ?: throw PatchException("${CreateUsherClientFingerprint.name} not found")
 
         // Inject OkHttp3 application interceptor
         result.mutableMethod.addInstructions(
@@ -70,7 +68,5 @@ class EmbeddedAdsPatch : BytecodePatch(
 
         SettingsPatch.addString("revanced_embedded_ads_service_unavailable", "%s is unavailable. Ads may show. Try switching to another ad block service in settings.")
         SettingsPatch.addString("revanced_embedded_ads_service_failed", "%s server returned an error. Ads may show. Try switching to another ad block service in settings.")
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/twitch/ad/video/patch/VideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/ad/video/patch/VideoAdsPatch.kt
index 9f21b258..216e676e 100644
--- a/src/main/kotlin/app/revanced/patches/twitch/ad/video/patch/VideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/ad/video/patch/VideoAdsPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -36,7 +34,7 @@ class VideoAdsPatch : AbstractAdPatch(
         GetReadyToShowAdFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         /* Amazon ads SDK */
         context.blockMethods(
             "Lcom/amazon/ads/video/player/AdsManagerImpl;",
@@ -97,7 +95,7 @@ class VideoAdsPatch : AbstractAdPatch(
                 """,
                 ExternalLabel(skipLabelName, mutableMethod.getInstruction(0))
             )
-        } ?: return CheckAdEligibilityLambdaFingerprint.toErrorResult()
+        } ?: throw CheckAdEligibilityLambdaFingerprint.toErrorResult()
 
         GetReadyToShowAdFingerprint.result?.apply {
             val adFormatDeclined = "Ltv/twitch/android/shared/display/ads/theatre/StreamDisplayAdsPresenter\$Action\$AdFormatDeclined;"
@@ -112,7 +110,7 @@ class VideoAdsPatch : AbstractAdPatch(
                 """,
                 ExternalLabel(skipLabelName, mutableMethod.getInstruction(0))
             )
-        } ?: return GetReadyToShowAdFingerprint.toErrorResult()
+        } ?: throw GetReadyToShowAdFingerprint.toErrorResult()
 
         // Spoof showAds JSON field
         ContentConfigShowAdsFingerprint.result?.apply {
@@ -123,7 +121,7 @@ class VideoAdsPatch : AbstractAdPatch(
                     return v0
                 """
             )
-        }  ?: return ContentConfigShowAdsFingerprint.toErrorResult()
+        }  ?: throw ContentConfigShowAdsFingerprint.toErrorResult()
 
         SettingsPatch.PreferenceScreen.ADS.CLIENT_SIDE.addPreferences(
             SwitchPreference(
@@ -143,7 +141,5 @@ class VideoAdsPatch : AbstractAdPatch(
                 default = true
             )
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt
index 5ba5bfd8..1c9f93a3 100644
--- a/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -41,7 +39,7 @@ class ShowDeletedMessagesPatch : BytecodePatch(
         if-eqz $register, :no_spoiler
     """
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // Spoiler mode: Force set hasModAccess member to true in constructor
         DeletedMessageClickableSpanCtorFingerprint.result?.mutableMethod?.apply {
             addInstructionsWithLabels(
@@ -53,11 +51,11 @@ class ShowDeletedMessagesPatch : BytecodePatch(
                 """,
                 ExternalLabel("no_spoiler", getInstruction(implementation!!.instructions.lastIndex))
             )
-        } ?: return DeletedMessageClickableSpanCtorFingerprint.toErrorResult()
+        } ?: throw DeletedMessageClickableSpanCtorFingerprint.toErrorResult()
 
         // Spoiler mode: Disable setHasModAccess setter
         SetHasModAccessFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
-            ?: return SetHasModAccessFingerprint.toErrorResult()
+            ?: throw SetHasModAccessFingerprint.toErrorResult()
 
         // Cross-out mode: Reformat span of deleted message
         ChatUtilCreateDeletedSpanFingerprint.result?.mutableMethod?.apply {
@@ -71,7 +69,7 @@ class ShowDeletedMessagesPatch : BytecodePatch(
                 """,
                 ExternalLabel("no_reformat", getInstruction(0))
             )
-        }  ?: return ChatUtilCreateDeletedSpanFingerprint.toErrorResult()
+        }  ?: throw ChatUtilCreateDeletedSpanFingerprint.toErrorResult()
 
         SettingsPatch.PreferenceScreen.CHAT.GENERAL.addPreferences(
             ListPreference(
@@ -101,7 +99,5 @@ class ShowDeletedMessagesPatch : BytecodePatch(
         )
 
         SettingsPatch.addString("revanced_deleted_msg", "message deleted")
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/patch/AutoClaimChannelPointsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/patch/AutoClaimChannelPointsPatch.kt
index 29479184..c2cbac8b 100644
--- a/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/patch/AutoClaimChannelPointsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/patch/AutoClaimChannelPointsPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -26,7 +24,7 @@ import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch
 class AutoClaimChannelPointPatch : BytecodePatch(
     listOf(CommunityPointsButtonViewDelegateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.CHAT.GENERAL.addPreferences(
             SwitchPreference(
                 "revanced_auto_claim_channel_points",
@@ -62,8 +60,6 @@ class AutoClaimChannelPointPatch : BytecodePatch(
                 """,
                 ExternalLabel("auto_claim", getInstruction(lastIndex))
             )
-        } ?: return CommunityPointsButtonViewDelegateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw CommunityPointsButtonViewDelegateFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/twitch/debug/patch/DebugModePatch.kt b/src/main/kotlin/app/revanced/patches/twitch/debug/patch/DebugModePatch.kt
index 6453739f..918a31db 100644
--- a/src/main/kotlin/app/revanced/patches/twitch/debug/patch/DebugModePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/debug/patch/DebugModePatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -31,7 +29,7 @@ class DebugModePatch : BytecodePatch(
         ShouldShowDebugOptionsFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         listOf(
             IsDebugConfigEnabledFingerprint,
             IsOmVerificationEnabledFingerprint,
@@ -46,7 +44,7 @@ class DebugModePatch : BytecodePatch(
                          return v0
                       """
                 )
-            } ?: return it.toErrorResult()
+            } ?: throw it.toErrorResult()
         }
 
         SettingsPatch.PreferenceScreen.MISC.OTHER.addPreferences(
@@ -67,7 +65,5 @@ class DebugModePatch : BytecodePatch(
                 default = false,
             )
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt
index 8f2b90ce..8bc157b1 100644
--- a/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt
@@ -10,8 +10,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
@@ -43,7 +41,7 @@ class SettingsPatch : BytecodePatch(
         MenuGroupsOnClickFingerprint
     )
 ), Closeable {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // Hook onCreate to handle fragment creation
         SettingsActivityOnCreateFingerprint.result?.apply {
             val insertIndex = mutableMethod.implementation!!.instructions.size - 2
@@ -57,7 +55,7 @@ class SettingsPatch : BytecodePatch(
                 """,
                 ExternalLabel("no_rv_settings_init", mutableMethod.getInstruction(insertIndex))
             )
-        } ?: return SettingsActivityOnCreateFingerprint.toErrorResult()
+        } ?: throw SettingsActivityOnCreateFingerprint.toErrorResult()
 
         // Create new menu item for settings menu
         SettingsMenuItemEnumFingerprint.result?.apply {
@@ -67,7 +65,7 @@ class SettingsPatch : BytecodePatch(
                 REVANCED_SETTINGS_MENU_ITEM_TITLE_RES,
                 REVANCED_SETTINGS_MENU_ITEM_ICON_RES
             )
-        } ?: return SettingsMenuItemEnumFingerprint.toErrorResult()
+        } ?: throw SettingsMenuItemEnumFingerprint.toErrorResult()
 
         // Intercept settings menu creation and add new menu item
         MenuGroupsUpdatedFingerprint.result?.apply {
@@ -79,7 +77,7 @@ class SettingsPatch : BytecodePatch(
                     move-result-object      p1
                 """
             )
-        } ?: return MenuGroupsUpdatedFingerprint.toErrorResult()
+        } ?: throw MenuGroupsUpdatedFingerprint.toErrorResult()
 
         // Intercept onclick events for the settings menu
         MenuGroupsOnClickFingerprint.result?.apply {
@@ -96,14 +94,12 @@ class SettingsPatch : BytecodePatch(
                 """,
                 ExternalLabel("no_rv_settings_onclick", mutableMethod.getInstruction(insertIndex))
             )
-        }  ?: return MenuGroupsOnClickFingerprint.toErrorResult()
+        }  ?: throw MenuGroupsOnClickFingerprint.toErrorResult()
 
         addString("revanced_settings", "ReVanced Settings", false)
         addString("revanced_reboot_message", "Twitch needs to restart to apply your changes. Restart now?", false)
         addString("revanced_reboot", "Restart", false)
         addString("revanced_cancel", "Cancel", false)
-
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/patch/DynamicColorPatch.kt b/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/patch/DynamicColorPatch.kt
index 190bd094..2ba9d29c 100644
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/patch/DynamicColorPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/patch/DynamicColorPatch.kt
@@ -3,9 +3,7 @@ package app.revanced.patches.twitter.misc.dynamiccolor.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.twitter.misc.dynamiccolor.annotations.DynamicColorCompatibility
@@ -17,9 +15,9 @@ import java.nio.file.Files
 @Description("Replaces the default Twitter Blue with the users Material You palette.")
 @DynamicColorCompatibility
 class DynamicColorPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         val resDirectory = context["res"]
-        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
+        if (!resDirectory.isDirectory) throw PatchException("The res folder can not be found.")
 
         val valuesV31Directory = resDirectory.resolve("values-v31")
         if (!valuesV31Directory.isDirectory) Files.createDirectories(valuesV31Directory.toPath())
@@ -79,7 +77,5 @@ class DynamicColorPatch : ResourcePatch {
                 document.getElementsByTagName("resources").item(0).appendChild(colorElement)
             }
         }
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/twitter/misc/hook/json/patch/JsonHookPatch.kt b/src/main/kotlin/app/revanced/patches/twitter/misc/hook/json/patch/JsonHookPatch.kt
index 18cad279..f5da4dda 100644
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/hook/json/patch/JsonHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/hook/json/patch/JsonHookPatch.kt
@@ -8,9 +8,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patches.twitter.misc.hook.json.fingerprints.JsonHookPatchFingerprint
 import app.revanced.patches.twitter.misc.hook.json.fingerprints.JsonInputStreamFingerprint
@@ -24,14 +22,14 @@ import java.io.InvalidClassException
 class JsonHookPatch : BytecodePatch(
     listOf(LoganSquareFingerprint)
 ), Closeable {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         JsonHookPatchFingerprint.also {
             // Make sure the integrations are present.
             val jsonHookPatch = context.findClass { classDef -> classDef.type == JSON_HOOK_PATCH_CLASS_DESCRIPTOR }
-                ?: throw PatchResultError("Could not find integrations.")
+                ?: throw PatchException("Could not find integrations.")
 
             if (!it.resolve(context, jsonHookPatch.immutableClass))
-                throw PatchResultError("Unexpected integrations.")
+                throw PatchException("Unexpected integrations.")
         }.let { hooks = JsonHookPatchHook(it) }
 
         // Conveniently find the type to hook a method in, via a named field.
@@ -42,7 +40,7 @@ class JsonHookPatch : BytecodePatch(
             ?.type
             .let { type ->
                 context.findClass { it.type == type }?.mutableClass
-            } ?: return PatchResultError("Could not find required class.")
+            } ?: throw PatchException("Could not find required class.")
 
         // Hook the methods first parameter.
         JsonInputStreamFingerprint
@@ -55,9 +53,7 @@ class JsonHookPatch : BytecodePatch(
                     invoke-static { p1 }, $JSON_HOOK_PATCH_CLASS_DESCRIPTOR->parseJsonHook(Ljava/io/InputStream;)Ljava/io/InputStream;
                     move-result-object p1
                 """
-            ) ?: return PatchResultError("Could not find method to hook.")
-
-        return PatchResultSuccess()
+            ) ?: throw PatchException("Could not find method to hook.")
     }
 
     /**
diff --git a/src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/BaseHookPatchPatch.kt b/src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/BaseHookPatchPatch.kt
index 4b71bc2a..e115d2c1 100644
--- a/src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/BaseHookPatchPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/misc/hook/patch/BaseHookPatchPatch.kt
@@ -2,16 +2,9 @@ package app.revanced.patches.twitter.misc.hook.patch
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.twitter.misc.hook.json.patch.JsonHookPatch
 
 abstract class BaseHookPatchPatch(private val hookClassDescriptor: String) : BytecodePatch() {
-    override fun execute(context: BytecodeContext) = try {
+    override fun execute(context: BytecodeContext) =
         JsonHookPatch.hooks.addHook(JsonHookPatch.Hook(context, hookClassDescriptor))
-
-        PatchResultSuccess()
-    } catch (ex: Exception) {
-        PatchResultError(ex)
-    }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/vsco/misc/pro/patch/UnlockProPatch.kt b/src/main/kotlin/app/revanced/patches/vsco/misc/pro/patch/UnlockProPatch.kt
index a96f53dc..74181ced 100644
--- a/src/main/kotlin/app/revanced/patches/vsco/misc/pro/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/vsco/misc/pro/patch/UnlockProPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.vsco.misc.pro.fingerprints.RevCatSubscriptionFingerprint
 
@@ -18,7 +16,7 @@ import app.revanced.patches.vsco.misc.pro.fingerprints.RevCatSubscriptionFingerp
 class UnlockProPatch : BytecodePatch(
     listOf(RevCatSubscriptionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         RevCatSubscriptionFingerprint.result?.mutableMethod?.apply {
             // Set isSubscribed to true.
             addInstruction(
@@ -27,8 +25,6 @@ class UnlockProPatch : BytecodePatch(
                     const p1, 0x1
                 """
             )
-        } ?: return RevCatSubscriptionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw RevCatSubscriptionFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/patch/FirebaseGetCertPatch.kt b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/patch/FirebaseGetCertPatch.kt
index c481655c..e0dab0cb 100644
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/patch/FirebaseGetCertPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/patch/FirebaseGetCertPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.FirebaseGetCertPatchCompatibility
 import app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints.GetMessagingCertFingerprint
 import app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints.GetReqistrationCertFingerprint
@@ -20,7 +18,7 @@ class FirebaseGetCertPatch : BytecodePatch(
         GetMessagingCertFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val spoofedInstruction =
             """
                 const-string v0, "0799DDF0414D3B3475E88743C91C0676793ED450"
@@ -38,7 +36,5 @@ class FirebaseGetCertPatch : BytecodePatch(
             0,
             spoofedInstruction
         )
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/patch/PromoCodeUnlockPatch.kt b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/patch/PromoCodeUnlockPatch.kt
index 4d8b84a4..8fda000b 100644
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/patch/PromoCodeUnlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/patch/PromoCodeUnlockPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.warnwetter.misc.firebasegetcert.patch.FirebaseGetCertPatch
@@ -28,7 +26,7 @@ class PromoCodeUnlockPatch : BytecodePatch(
     )
 ) {
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val method = PromoCodeUnlockFingerprint.result!!.mutableMethod
         method.addInstructions(
             0,
@@ -37,8 +35,6 @@ class PromoCodeUnlockPatch : BytecodePatch(
                 return v0
             """
         )
-
-        return PatchResultSuccess()
     }
 
 
diff --git a/src/main/kotlin/app/revanced/patches/windyapp/misc/unlockpro/patch/UnlockProPatch.kt b/src/main/kotlin/app/revanced/patches/windyapp/misc/unlockpro/patch/UnlockProPatch.kt
index 5827a324..bf1b7208 100644
--- a/src/main/kotlin/app/revanced/patches/windyapp/misc/unlockpro/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/windyapp/misc/unlockpro/patch/UnlockProPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.windyapp.misc.unlockpro.annotations.UnlockProCompatibility
 import app.revanced.patches.windyapp.misc.unlockpro.fingerprints.CheckProFingerprint
@@ -20,7 +18,7 @@ class UnlockProPatch : BytecodePatch(
         CheckProFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
          val method = CheckProFingerprint.result!!.mutableMethod
         method.addInstructions(
             0,
@@ -29,7 +27,5 @@ class UnlockProPatch : BytecodePatch(
                 return v0
             """
         )
-        
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/HideAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/HideAdsPatch.kt
index 1112a5c8..ea2eb2d0 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/HideAdsPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch
@@ -33,7 +31,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 @Description("Removes general ads.")
 @HideAdsCompatibility
 class HideAdsPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         context.classes.forEach { classDef ->
             classDef.methods.forEach { method ->
                 with(method.implementation) {
@@ -67,7 +65,5 @@ class HideAdsPatch : BytecodePatch() {
                 }
             }
         }
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/HideAdsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/HideAdsResourcePatch.kt
index b021d523..7967f66d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/HideAdsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/HideAdsResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.ad.general.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -22,7 +20,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch.P
 )
 @HideAdsCompatibility
 class HideAdsResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         PreferenceScreen.ADS.addPreferences(
             SwitchPreference(
                 "revanced_hide_general_ads",
@@ -71,8 +69,6 @@ class HideAdsResourcePatch : ResourcePatch {
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
 
         adAttributionId = ResourceMappingPatch.resourceMappings.single { it.name == "ad_attribution" }.id
-
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt
index 724a43c1..2ee456ad 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
@@ -21,7 +19,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 @Name("Hide get premium")
 @HideGetPremiumCompatibility
 class HideGetPremiumPatch : BytecodePatch(listOf(GetPremiumViewFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.ADS.addPreferences(
             SwitchPreference(
                 "revanced_hide_get_premium",
@@ -64,9 +62,7 @@ class HideGetPremiumPatch : BytecodePatch(listOf(GetPremiumViewFingerprint)) {
                     """
                 )
             }
-        } ?: return GetPremiumViewFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw GetPremiumViewFingerprint.toErrorResult()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt
index b26d8b3b..1df08ae8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -28,7 +26,7 @@ class VideoAdsPatch : BytecodePatch(
         LoadVideoAdsFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.ADS.addPreferences(
             SwitchPreference(
                 "revanced_hide_video_ads",
@@ -49,7 +47,5 @@ class VideoAdsPatch : BytecodePatch(
             """,
             ExternalLabel("show_video_ads", loadVideoAdsFingerprintMethod.getInstruction(0))
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/bytecode/patch/CopyVideoUrlBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/bytecode/patch/CopyVideoUrlBytecodePatch.kt
index a6db2560..ba80eb1a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/bytecode/patch/CopyVideoUrlBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/bytecode/patch/CopyVideoUrlBytecodePatch.kt
@@ -4,8 +4,6 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.interaction.copyvideourl.annotation.CopyVideoUrlCompatibility
@@ -31,14 +29,12 @@ class CopyVideoUrlBytecodePatch : BytecodePatch() {
         )
     }
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         // Initialize buttons and inject visibility control
         BUTTONS_DESCRIPTORS.forEach { descriptor ->
             PlayerControlsBytecodePatch.initializeControl("$descriptor->initializeButton(Landroid/view/View;)V")
             PlayerControlsBytecodePatch.injectVisibilityCheckCall("$descriptor->changeVisibility(Z)V")
         }
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/resource/patch/CopyVideoUrlResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/resource/patch/CopyVideoUrlResourcePatch.kt
index 74565636..48a265e8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/resource/patch/CopyVideoUrlResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/resource/patch/CopyVideoUrlResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.interaction.copyvideourl.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
@@ -16,7 +14,7 @@ import app.revanced.util.resources.ResourceUtils.mergeStrings
 
 @DependsOn([BottomControlsResourcePatch::class, SettingsPatch::class])
 class CopyVideoUrlResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
             PreferenceScreen(
                 "revanced_copy_video_url_preference_screen",
@@ -49,7 +47,5 @@ class CopyVideoUrlResourcePatch : ResourcePatch {
         context.mergeStrings("copyvideourl/host/values/strings.xml")
 
         BottomControlsResourcePatch.addControls("copyvideourl/host/layout/${BottomControlsResourcePatch.TARGET_RESOURCE_NAME}")
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/ExternalDownloadsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/ExternalDownloadsBytecodePatch.kt
index 1b7a82ac..ccc95281 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/ExternalDownloadsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/ExternalDownloadsBytecodePatch.kt
@@ -4,8 +4,6 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.interaction.downloads.annotation.ExternalDownloadsCompatibility
@@ -23,7 +21,7 @@ class ExternalDownloadsBytecodePatch : BytecodePatch() {
         const val BUTTON_DESCRIPTOR = "Lapp/revanced/integrations/videoplayer/ExternalDownloadButton;"
     }
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         /*
         initialize the control
          */
@@ -37,7 +35,5 @@ class ExternalDownloadsBytecodePatch : BytecodePatch() {
 
         PlayerControlsBytecodePatch.injectVisibilityCheckCall(
             "$BUTTON_DESCRIPTOR->changeVisibility(Z)V")
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/resource/patch/ExternalDownloadsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/resource/patch/ExternalDownloadsResourcePatch.kt
index 77b4763a..d9040f05 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/resource/patch/ExternalDownloadsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/resource/patch/ExternalDownloadsResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.interaction.downloads.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.settings.preference.impl.*
@@ -15,7 +13,7 @@ import app.revanced.util.resources.ResourceUtils.mergeStrings
 @DependsOn([BottomControlsResourcePatch::class, SettingsPatch::class])
 class ExternalDownloadsResourcePatch : ResourcePatch {
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
             PreferenceScreen(
                 "revanced_external_downloader_preference_screen",
@@ -47,7 +45,5 @@ class ExternalDownloadsResourcePatch : ResourcePatch {
 
         // Add download button node
         BottomControlsResourcePatch.addControls("downloads/host/layout/${BottomControlsResourcePatch.TARGET_RESOURCE_NAME}")
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt
index 32a5ed3b..775fd6ae 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -31,7 +29,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 class EnableSeekbarTappingPatch : BytecodePatch(
     listOf(OnTouchEventHandlerFingerprint, SeekbarTappingFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // Find the required methods to tap the seekbar.
         val seekbarTappingMethods = OnTouchEventHandlerFingerprint.result?.let {
             val patternScanResult = it.scanResult.patternScanResult!!
@@ -45,7 +43,7 @@ class EnableSeekbarTappingPatch : BytecodePatch(
             }
         }
 
-        seekbarTappingMethods ?: return OnTouchEventHandlerFingerprint.toErrorResult()
+        seekbarTappingMethods ?: throw OnTouchEventHandlerFingerprint.toErrorResult()
 
         SeekbarTappingFingerprint.result?.let {
             val insertIndex = it.scanResult.patternScanResult!!.endIndex - 1
@@ -74,8 +72,6 @@ class EnableSeekbarTappingPatch : BytecodePatch(
                     ExternalLabel("disabled", getInstruction(insertIndex))
                 )
             }
-        } ?: return SeekbarTappingFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw SeekbarTappingFingerprint.toErrorResult()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingResourcePatch.kt
index a28a5327..31e72ca2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.interaction.seekbar.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -11,7 +9,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
 @DependsOn([SettingsPatch::class])
 class EnableSeekbarTappingResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
             SwitchPreference(
                 "revanced_seekbar_tapping",
@@ -20,6 +18,5 @@ class EnableSeekbarTappingResourcePatch : ResourcePatch {
                 StringResource("revanced_seekbar_tapping_summary_off", "Seekbar tapping is disabled")
             )
         )
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/bytecode/SwipeControlsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/bytecode/SwipeControlsBytecodePatch.kt
index 910e9104..16a27bdf 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/bytecode/SwipeControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/bytecode/SwipeControlsBytecodePatch.kt
@@ -1,15 +1,13 @@
 package app.revanced.patches.youtube.interaction.swipecontrols.patch.bytecode
 
 import app.revanced.extensions.transformMethods
+import app.revanced.extensions.traverseClassHierarchy
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.util.TypeUtil.traverseClassHierarchy
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.shared.fingerprints.WatchWhileActivityFingerprint
 import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeControlsCompatibility
@@ -37,7 +35,7 @@ class SwipeControlsBytecodePatch : BytecodePatch(
         SwipeControlsHostActivityFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val wrapperClass = SwipeControlsHostActivityFingerprint.result!!.mutableClass
         val targetClass = WatchWhileActivityFingerprint.result!!.mutableClass
 
@@ -61,6 +59,5 @@ class SwipeControlsBytecodePatch : BytecodePatch(
                 ).toMutable()
             }
         }
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt
index 5d67f721..01439789 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.interaction.swipecontrols.patch.resource
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.settings.preference.impl.*
@@ -12,7 +10,7 @@ import app.revanced.util.resources.ResourceUtils.copyResources
 
 @DependsOn([SettingsPatch::class])
 class SwipeControlsResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
             PreferenceScreen(
                 "revanced_swipe_controls_preference_screen",
@@ -102,6 +100,5 @@ class SwipeControlsResourcePatch : ResourcePatch {
                 "ic_sc_volume_normal.xml"
             )
         )
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/patch/AutoCaptionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/patch/AutoCaptionsPatch.kt
index ae4048ad..d7c40a80 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/patch/AutoCaptionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/patch/AutoCaptionsPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -29,7 +27,7 @@ class AutoCaptionsPatch : BytecodePatch(
         StartVideoInformerFingerprint, SubtitleButtonControllerFingerprint, SubtitleTrackFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_auto_captions",
@@ -72,7 +70,5 @@ class AutoCaptionsPatch : BytecodePatch(
             nop
         """
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt
index 74c52a4b..c5f408d2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt
@@ -3,9 +3,7 @@ package app.revanced.patches.youtube.layout.branding.header.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.branding.header.annotations.PremiumHeadingCompatibility
@@ -18,9 +16,9 @@ import kotlin.io.path.exists
 @Description("Shows premium branding on the home screen.")
 @PremiumHeadingCompatibility
 class PremiumHeadingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         val resDirectory = context["res"]
-        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
+        if (!resDirectory.isDirectory) throw PatchException("The res folder can not be found.")
 
         val (original, replacement) = "yt_premium_wordmark_header" to "yt_wordmark_header"
         val modes = arrayOf("light", "dark")
@@ -32,7 +30,7 @@ class PremiumHeadingPatch : ResourcePatch {
                 val toPath = headingDirectory.resolve("${replacement}_$mode.png").toPath()
 
                 if (!fromPath.exists())
-                    return PatchResultError("The file $fromPath does not exist in the resources. Therefore, this patch can not succeed.")
+                    throw PatchException("The file $fromPath does not exist in the resources. Therefore, this patch can not succeed.")
                 Files.copy(
                     fromPath,
                     toPath,
@@ -40,7 +38,5 @@ class PremiumHeadingPatch : ResourcePatch {
                 )
             }
         }
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt
index cc01995a..d133fcf2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt
@@ -16,7 +16,7 @@ import java.nio.file.Files
 @Description("Changes the YouTube launcher icon and name to your choice (defaults to ReVanced).")
 @CustomBrandingCompatibility
 class CustomBrandingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         fun copyResources(resourceGroups: List<ResourceUtils.ResourceGroup>) {
             iconPath?.let { iconPathString ->
                 val iconPath = File(iconPathString)
@@ -62,8 +62,6 @@ class CustomBrandingPatch : ResourcePatch {
                     "android:label=\"$appName"
                 )
         )
-
-        return PatchResultSuccess()
     }
 
     companion object : OptionsContainer() {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/patch/HideButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/patch/HideButtonsPatch.kt
index 507fff12..04eceb04 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/patch/HideButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/patch/HideButtonsPatch.kt
@@ -3,8 +3,6 @@ package app.revanced.patches.youtube.layout.buttons.action.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
@@ -22,7 +20,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 @Description("Adds the options to hide action buttons under a video.")
 @HideButtonsCompatibility
 class HideButtonsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             PreferenceScreen(
                 "revanced_hide_buttons_preference_screen",
@@ -94,8 +92,6 @@ class HideButtonsPatch : ResourcePatch {
         )
 
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt
index f60021dc..6081ad74 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -33,7 +31,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 class HideAutoplayButtonPatch : BytecodePatch(
     listOf(LayoutConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_autoplay_button",
@@ -70,8 +68,6 @@ class HideAutoplayButtonPatch : BytecodePatch(
                 """,
                 ExternalLabel("hidden", jumpInstruction)
             )
-        } ?: return LayoutConstructorFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw LayoutConstructorFingerprint.toErrorResult()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/patch/HideCaptionsButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/patch/HideCaptionsButtonPatch.kt
index 34940dd2..71d4a81f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/patch/HideCaptionsButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/patch/HideCaptionsButtonPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -25,7 +23,7 @@ import com.android.tools.smali.dexlib2.Opcode
 class HideCaptionsButtonPatch : BytecodePatch(listOf(
     SubtitleButtonControllerFingerprint,
 )) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_captions_button",
@@ -48,7 +46,5 @@ class HideCaptionsButtonPatch : BytecodePatch(listOf(
                 invoke-static {v0}, Lapp/revanced/integrations/patches/HideCaptionsButtonPatch;->hideCaptionsButton(Landroid/widget/ImageView;)V
             """
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/cast/patch/HideCastButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/cast/patch/HideCastButtonPatch.kt
index 966dfd7d..74bc155b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/cast/patch/HideCastButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/cast/patch/HideCastButtonPatch.kt
@@ -5,9 +5,7 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -22,7 +20,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 @Description("Hides the cast button in the video player.")
 @CastButtonCompatibility
 class HideCastButtonPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_cast_button",
@@ -33,7 +31,7 @@ class HideCastButtonPatch : BytecodePatch() {
         )
 
         val buttonClass = context.findClass("MediaRouteButton")
-            ?: return PatchResultError("MediaRouteButton class not found.")
+            ?: throw PatchException("MediaRouteButton class not found.")
 
         buttonClass.mutableClass.methods.find { it.name == "setVisibility" }?.apply {
             addInstructions(
@@ -43,8 +41,6 @@ class HideCastButtonPatch : BytecodePatch() {
                     move-result p1
                 """
             )
-        } ?: return PatchResultError("setVisibility method not found.")
-
-        return PatchResultSuccess()
+        } ?: throw PatchException("setVisibility method not found.")
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt
index d88b796f..1fd963fa 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
@@ -36,7 +34,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Adds options to hide or change navigation buttons.")
 @NavigationButtonsCompatibility
 class NavigationButtonsPatch : BytecodePatch(listOf(AddCreateButtonViewFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             PreferenceScreen(
                 "revanced_navigation_buttons_preference_screen",
@@ -103,7 +101,7 @@ class NavigationButtonsPatch : BytecodePatch(listOf(AddCreateButtonViewFingerpri
                             initializeButtonsResult.mutableClass
                         )
                     )
-                        return it.toErrorResult()
+                        throw it.toErrorResult()
                 }
                 .map { it.result!!.scanResult.patternScanResult!! }
 
@@ -152,7 +150,7 @@ class NavigationButtonsPatch : BytecodePatch(listOf(AddCreateButtonViewFingerpri
                     """
                 )
             }
-        } ?: return AddCreateButtonViewFingerprint.toErrorResult()
+        } ?: throw AddCreateButtonViewFingerprint.toErrorResult()
 
         /*
          * Resolve fingerprints
@@ -160,7 +158,7 @@ class NavigationButtonsPatch : BytecodePatch(listOf(AddCreateButtonViewFingerpri
 
         InitializeButtonsFingerprint.result!!.let {
             if (!PivotBarCreateButtonViewFingerprint.resolve(context, it.mutableMethod, it.mutableClass))
-                return PivotBarCreateButtonViewFingerprint.toErrorResult()
+                throw PivotBarCreateButtonViewFingerprint.toErrorResult()
         }
 
         PivotBarCreateButtonViewFingerprint.result!!.apply {
@@ -180,7 +178,6 @@ class NavigationButtonsPatch : BytecodePatch(listOf(AddCreateButtonViewFingerpri
 
             mutableMethod.injectHook(hook, insertIndex)
         }
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/ResolvePivotBarFingerprintsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/ResolvePivotBarFingerprintsPatch.kt
index 74f89732..99d36b4b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/ResolvePivotBarFingerprintsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/ResolvePivotBarFingerprintsPatch.kt
@@ -5,9 +5,7 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.InitializeButtonsFingerprint
@@ -18,10 +16,10 @@ import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.Pivot
 class ResolvePivotBarFingerprintsPatch : BytecodePatch(
     listOf(PivotBarConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // imageOnlyTabResourceId is used in InitializeButtonsFingerprint fingerprint
         ResourceMappingPatch.resourceMappings.find { it.type == "layout" && it.name == "image_only_tab" }
-            ?.let { imageOnlyTabResourceId = it.id } ?: return PatchResultError("Failed to find resource")
+            ?.let { imageOnlyTabResourceId = it.id } ?: throw PatchException("Failed to find resource")
 
         PivotBarConstructorFingerprint.result?.let {
             // Resolve InitializeButtonsFingerprint on the class of the method
@@ -30,9 +28,8 @@ class ResolvePivotBarFingerprintsPatch : BytecodePatch(
                     context,
                     it.classDef
                 )
-            ) return InitializeButtonsFingerprint.toErrorResult()
-        } ?: return PivotBarConstructorFingerprint.toErrorResult()
-        return PatchResultSuccess()
+            ) throw InitializeButtonsFingerprint.toErrorResult()
+        } ?: throw PivotBarConstructorFingerprint.toErrorResult()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt
index c1225205..58065b69 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -32,7 +30,7 @@ class HidePlayerButtonsPatch : BytecodePatch(
         const val HAS_PREVIOUS = 6
     }
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_player_buttons",
@@ -69,7 +67,6 @@ class HidePlayerButtonsPatch : BytecodePatch(
                     move-result v$hasPreviousParameterRegister
                 """
             )
-        } ?: return PlayerControlsVisibilityModelFingerprint.toErrorResult()
-        return PatchResultSuccess()
+        } ?: throw PlayerControlsVisibilityModelFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt
index 3521d7fd..a58f1353 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.hide.albumcards.annotations.AlbumCardsCompatibility
@@ -27,7 +25,7 @@ class AlbumCardsPatch : BytecodePatch(
         AlbumCardsFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         AlbumCardsFingerprint.result?.let {
             it.mutableMethod.apply {
                 val checkCastAnchorIndex = it.scanResult.patternScanResult!!.endIndex
@@ -43,8 +41,6 @@ class AlbumCardsPatch : BytecodePatch(
                             "hideAlbumCard(Landroid/view/View;)V"
                 )
             }
-        } ?: return AlbumCardsFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw AlbumCardsFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/resource/patch/AlbumCardsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/resource/patch/AlbumCardsResourcePatch.kt
index 3c3359f3..2e22a4c5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/resource/patch/AlbumCardsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/resource/patch/AlbumCardsResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.albumcards.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -16,7 +14,7 @@ class AlbumCardsResourcePatch : ResourcePatch {
         internal var albumCardId: Long = -1
     }
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_album_cards",
@@ -29,7 +27,5 @@ class AlbumCardsResourcePatch : ResourcePatch {
         albumCardId = ResourceMappingPatch.resourceMappings.single {
             it.type == "layout" && it.name == "album_card"
         }.id
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt
index 71921d5e..05e847ff 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.hide.breakingnews.annotations.BreakingNewsCompatibility
@@ -25,7 +23,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class BreakingNewsPatch : BytecodePatch(
     listOf(BreakingNewsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         BreakingNewsFingerprint.result?.let {
             val insertIndex = it.scanResult.patternScanResult!!.endIndex - 1
             val moveResultIndex = insertIndex - 1
@@ -44,9 +42,7 @@ class BreakingNewsPatch : BytecodePatch(
                 )
             }
 
-        } ?: return BreakingNewsFingerprint.toErrorResult()
+        } ?: throw BreakingNewsFingerprint.toErrorResult()
 
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/resource/patch/BreakingNewsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/resource/patch/BreakingNewsResourcePatch.kt
index 9a9235a6..2a679a96 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/resource/patch/BreakingNewsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/resource/patch/BreakingNewsResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.breakingnews.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -16,7 +14,7 @@ class BreakingNewsResourcePatch : ResourcePatch {
         internal var horizontalCardListId: Long = -1
     }
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_breaking_news",
@@ -29,7 +27,5 @@ class BreakingNewsResourcePatch : ResourcePatch {
         horizontalCardListId = ResourceMappingPatch.resourceMappings.single {
             it.type == "layout" && it.name == "horizontal_card_list"
         }.id
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/patch/CommentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/patch/CommentsPatch.kt
index cbee5122..02054c4b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/patch/CommentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/patch/CommentsPatch.kt
@@ -3,8 +3,6 @@ package app.revanced.patches.youtube.layout.hide.comments.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
@@ -21,7 +19,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 @HideCommentsCompatibility
 @DependsOn([SettingsPatch::class, LithoFilterPatch::class])
 class CommentsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
         
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
@@ -45,8 +43,6 @@ class CommentsPatch : ResourcePatch {
                 StringResource("revanced_comments_preference_screen_summary", "Manage the visibility of comments section components")
             )
         )
-
-        return PatchResultSuccess()
     }
     
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt
index 7df00689..eb500c75 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.hide.crowdfundingbox.annotations.CrowdfundingBoxCompatibility
@@ -27,7 +25,7 @@ class CrowdfundingBoxPatch : BytecodePatch(
         CrowdfundingBoxFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         CrowdfundingBoxFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = it.scanResult.patternScanResult!!.endIndex
@@ -35,9 +33,7 @@ class CrowdfundingBoxPatch : BytecodePatch(
 
                 addInstruction(insertIndex, "invoke-static {v$objectRegister}, $INTEGRATIONS_METHOD_DESCRIPTOR")
             }
-        } ?: return CrowdfundingBoxFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw CrowdfundingBoxFingerprint.toErrorResult()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/resource/patch/CrowdfundingBoxResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/resource/patch/CrowdfundingBoxResourcePatch.kt
index b6af9905..4d0cc7c2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/resource/patch/CrowdfundingBoxResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/resource/patch/CrowdfundingBoxResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.crowdfundingbox.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -16,7 +14,7 @@ class CrowdfundingBoxResourcePatch : ResourcePatch {
         internal var crowdfundingBoxId: Long = -1
     }
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_crowdfunding_box",
@@ -29,7 +27,5 @@ class CrowdfundingBoxResourcePatch : ResourcePatch {
         crowdfundingBoxId = ResourceMappingPatch.resourceMappings.single {
             it.type == "layout" && it.name == "donation_companion"
         }.id
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt
index c5eeb6d9..007a303c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.hide.endscreencards.annotations.HideEndscreenCardsCompatibility
@@ -32,7 +30,7 @@ class HideEndscreenCardsPatch : BytecodePatch(
         LayoutVideoFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         fun MethodFingerprint.injectHideCall() {
             val layoutResult = result ?: throw toErrorResult()
             layoutResult.mutableMethod.apply {
@@ -51,7 +49,5 @@ class HideEndscreenCardsPatch : BytecodePatch(
             LayoutIconFingerprint,
             LayoutVideoFingerprint
         ).forEach(MethodFingerprint::injectHideCall)
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/resource/patch/HideEndscreenCardsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/resource/patch/HideEndscreenCardsResourcePatch.kt
index 577a7f19..78c0253b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/resource/patch/HideEndscreenCardsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/resource/patch/HideEndscreenCardsResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.endscreencards.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -18,7 +16,7 @@ class HideEndscreenCardsResourcePatch : ResourcePatch {
         var layoutVideo: Long = -1
     }
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_endscreen_cards",
@@ -35,7 +33,5 @@ class HideEndscreenCardsResourcePatch : ResourcePatch {
         layoutCircle = findEndscreenResourceId("circle")
         layoutIcon = findEndscreenResourceId("icon")
         layoutVideo = findEndscreenResourceId("video")
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarPatch.kt
index a0a44d79..91067ea5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.hide.filterbar.annotations.HideFilterBar
@@ -31,7 +29,7 @@ class HideFilterBarPatch : BytecodePatch(
         FilterBarHeightFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         FilterBarHeightFingerprint.patch<TwoRegisterInstruction> { register ->
             """
                 invoke-static { v$register }, $INTEGRATIONS_CLASS_DESCRIPTOR->hideInFeed(I)I
@@ -50,8 +48,6 @@ class HideFilterBarPatch : BytecodePatch(
                 move-result v$register
             """
         }
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarResourcePatch.kt
index ab0e3241..9360541b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/patch/HideFilterBarResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.filterbar.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -13,7 +11,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 class HideFilterBarResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             PreferenceScreen(
                 "revanced_hide_filter_bar_preference",
@@ -78,8 +76,6 @@ class HideFilterBarResourcePatch : ResourcePatch {
         relatedChipCloudMarginId = "related_chip_cloud_reduced_margins".layoutResourceId("layout")
         filterBarHeightId = "filter_bar_height".layoutResourceId()
         barContainerHeightId = "bar_container_height".layoutResourceId()
-
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt
index 6399085a..541dcfe8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.hide.floatingmicrophone.annotations.HideFloatingMicrophoneButtonCompatibility
@@ -23,7 +21,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 class HideFloatingMicrophoneButtonPatch : BytecodePatch(
     listOf(ShowFloatingMicrophoneButtonFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShowFloatingMicrophoneButtonFingerprint.result?.let { result ->
             with(result.mutableMethod) {
                 val insertIndex = result.scanResult.patternScanResult!!.startIndex + 1
@@ -37,9 +35,7 @@ class HideFloatingMicrophoneButtonPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return ShowFloatingMicrophoneButtonFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw ShowFloatingMicrophoneButtonFingerprint.toErrorResult()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonResourcePatch.kt
index e3e03d98..7dcb04ab 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonResourcePatch.kt
@@ -1,9 +1,7 @@
 package app.revanced.patches.youtube.layout.hide.floatingmicrophone.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -15,7 +13,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 @HideFloatingMicrophoneButtonCompatibility
 class HideFloatingMicrophoneButtonResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_floating_microphone_button",
@@ -29,8 +27,7 @@ class HideFloatingMicrophoneButtonResourcePatch : ResourcePatch {
         )
 
         fabButtonId = ResourceMappingPatch.resourceMappings.find { it.type == "id" && it.name == "fab" }?.id
-            ?: return PatchResultError("Can not find required fab button resource id")
-        return PatchResultSuccess()
+            ?: throw PatchException("Can not find required fab button resource id")
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/patch/HideLayoutComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/patch/HideLayoutComponentsPatch.kt
index 64047949..75c1a8cc 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/patch/HideLayoutComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/patch/HideLayoutComponentsPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -30,7 +28,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch.P
 class HideLayoutComponentsPatch : BytecodePatch(
     listOf(ConvertElementToFlatBufferFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_gray_separator",
@@ -274,11 +272,9 @@ class HideLayoutComponentsPatch : BytecodePatch(
                 addInstruction(0, "move-object/from16 v$freeRegister, p3")
             }
 
-        } ?: return ConvertElementToFlatBufferFingerprint.toErrorResult()
+        } ?: throw ConvertElementToFlatBufferFingerprint.toErrorResult()
 
         // endregion
-
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt
index e725b832..c4eb7505 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -34,7 +32,7 @@ class HideInfoCardsPatch : BytecodePatch(
         InfocardsMethodCallFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
        InfocardsIncognitoFingerprint.also {
             it.resolve(context, InfocardsIncognitoParentFingerprint.result!!.classDef)
         }.result!!.mutableMethod.apply {
@@ -68,7 +66,5 @@ class HideInfoCardsPatch : BytecodePatch(
                 )
             )
         }
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/resource/patch/HideInfocardsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/resource/patch/HideInfocardsResourcePatch.kt
index 9b36d35f..27a1e48c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/resource/patch/HideInfocardsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/resource/patch/HideInfocardsResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.infocards.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -18,7 +16,7 @@ class HideInfocardsResourcePatch : ResourcePatch {
         var drawerResourceId: Long = -1
     }
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_info_cards",
@@ -31,7 +29,5 @@ class HideInfocardsResourcePatch : ResourcePatch {
         drawerResourceId = ResourceMappingPatch.resourceMappings.single {
             it.type == "id" && it.name == "info_cards_drawer_header"
         }.id
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/patch/HideLoadMoreButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/patch/HideLoadMoreButtonPatch.kt
index e4ecb0e7..768a7ba6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/patch/HideLoadMoreButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/bytecode/patch/HideLoadMoreButtonPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.hide.loadmorebutton.bytecode.fingerprints.HideLoadMoreButtonFingerprint
@@ -22,7 +20,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @DependsOn([HideLoadMoreButtonResourcePatch::class])
 @HideLoadMoreButtonCompatibility
 class HideLoadMoreButtonPatch : BytecodePatch(listOf(HideLoadMoreButtonFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         HideLoadMoreButtonFingerprint.result?.let {
             it.mutableMethod.apply {
                 val moveRegisterIndex = it.scanResult.patternScanResult!!.endIndex
@@ -35,9 +33,7 @@ class HideLoadMoreButtonPatch : BytecodePatch(listOf(HideLoadMoreButtonFingerpri
                             "$INTEGRATIONS_CLASS_DESCRIPTOR->hideLoadMoreButton(Landroid/view/View;)V"
                 )
             }
-        } ?: return HideLoadMoreButtonFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw HideLoadMoreButtonFingerprint.toErrorResult()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/resource/patch/HideLoadMoreButtonResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/resource/patch/HideLoadMoreButtonResourcePatch.kt
index d74dd3d7..b50779d2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/resource/patch/HideLoadMoreButtonResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/resource/patch/HideLoadMoreButtonResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.loadmorebutton.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -12,7 +10,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 class HideLoadMoreButtonResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_load_more_button",
@@ -25,8 +23,6 @@ class HideLoadMoreButtonResourcePatch : ResourcePatch {
         expandButtonDownId = ResourceMappingPatch.resourceMappings.single {
             it.type == "layout" && it.name == "expand_button_down"
         }.id
-
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt
index 149eaed8..fef13b09 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.hide.personalinformation.annotations.HideEmailAddressCompatibility
@@ -27,7 +25,7 @@ class HideEmailAddressPatch : BytecodePatch(
         AccountSwitcherAccessibilityLabelFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         AccountSwitcherAccessibilityLabelFingerprint.result?.let {
             it.mutableMethod.apply {
                 val setVisibilityConstIndex = it.scanResult.patternScanResult!!.endIndex
@@ -43,8 +41,6 @@ class HideEmailAddressPatch : BytecodePatch(
                     """
                 )
             }
-        } ?: return AccountSwitcherAccessibilityLabelFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw AccountSwitcherAccessibilityLabelFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/resource/patch/HideEmailAddressResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/resource/patch/HideEmailAddressResourcePatch.kt
index dd9ed271..bd6bf8c8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/resource/patch/HideEmailAddressResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/resource/patch/HideEmailAddressResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.personalinformation.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -16,7 +14,7 @@ class HideEmailAddressResourcePatch : ResourcePatch {
         internal var accountSwitcherAccessibilityLabelId: Long = -1
     }
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_email_address",
@@ -29,7 +27,5 @@ class HideEmailAddressResourcePatch : ResourcePatch {
         accountSwitcherAccessibilityLabelId = ResourceMappingPatch.resourceMappings.single {
             it.type == "string" && it.name == "account_switcher_accessibility_label"
         }.id
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/patch/HidePlayerFlyoutMenuPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/patch/HidePlayerFlyoutMenuPatch.kt
index 49848fd3..9099f582 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/patch/HidePlayerFlyoutMenuPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/patch/HidePlayerFlyoutMenuPatch.kt
@@ -3,8 +3,6 @@ package app.revanced.patches.youtube.layout.hide.player.flyoutmenupanel.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
@@ -21,7 +19,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 @DependsOn([LithoFilterPatch::class, SettingsPatch::class])
 @HidePlayerFlyoutMenuItemsCompatibility
 class HidePlayerFlyoutMenuPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             PreferenceScreen(
                 KEY,
@@ -93,8 +91,6 @@ class HidePlayerFlyoutMenuPatch : ResourcePatch {
         )
 
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/bytecode/patch/HidePlayerOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/bytecode/patch/HidePlayerOverlayPatch.kt
index e5543f1f..ab7914eb 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/bytecode/patch/HidePlayerOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/bytecode/patch/HidePlayerOverlayPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.hide.player.overlay.annotations.HidePlayerOverlayPatchCompatibility
@@ -23,7 +21,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @DependsOn([HidePlayerOverlayResourcePatch::class])
 @HidePlayerOverlayPatchCompatibility
 class HidePlayerOverlayPatch : BytecodePatch(listOf(CreatePlayerOverviewFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         CreatePlayerOverviewFingerprint.result?.let { result ->
             result.mutableMethod.apply {
                 val viewRegisterIndex =
@@ -37,9 +35,7 @@ class HidePlayerOverlayPatch : BytecodePatch(listOf(CreatePlayerOverviewFingerpr
                             "$INTEGRATIONS_CLASS_DESCRIPTOR->hidePlayerOverlay(Landroid/widget/ImageView;)V"
                 )
             }
-        } ?: return CreatePlayerOverviewFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw CreatePlayerOverviewFingerprint.toErrorResult()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/resource/patch/HidePlayerOverlayResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/resource/patch/HidePlayerOverlayResourcePatch.kt
index 5f571045..cc794c4d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/resource/patch/HidePlayerOverlayResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/resource/patch/HidePlayerOverlayResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.player.overlay.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -12,7 +10,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 class HidePlayerOverlayResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_player_overlay",
@@ -25,8 +23,6 @@ class HidePlayerOverlayResourcePatch : ResourcePatch {
         scrimOverlayId = ResourceMappingPatch.resourceMappings.single {
             it.type == "id" && it.name == "scrim_overlay"
         }.id
-
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/patch/HideSeekbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/patch/HideSeekbarPatch.kt
index 9cc247af..dcdecd72 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/patch/HideSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/patch/HideSeekbarPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.fingerprints.SeekbarFingerprint
@@ -35,7 +33,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 class HideSeekbarPatch : BytecodePatch(
     listOf(SeekbarFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SeekbarPreferencesPatch.addPreferences(
             SwitchPreference(
                 "revanced_hide_seekbar",
@@ -65,7 +63,5 @@ class HideSeekbarPatch : BytecodePatch(
                 nop
             """
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/bytecode/patch/HideShortsComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/bytecode/patch/HideShortsComponentsPatch.kt
index aa1c6997..74659eee 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/bytecode/patch/HideShortsComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/bytecode/patch/HideShortsComponentsPatch.kt
@@ -10,8 +10,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -46,7 +44,7 @@ class HideShortsComponentsPatch : BytecodePatch(
         SetPivotBarVisibilityParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
 
         // region Hide the Shorts shelf.
@@ -63,7 +61,7 @@ class HideShortsComponentsPatch : BytecodePatch(
                     "hideShortsShelf"
                 )
             }
-        } ?: return ReelConstructorFingerprint.toErrorResult()
+        } ?: throw ReelConstructorFingerprint.toErrorResult()
 
         // endregion
 
@@ -72,7 +70,7 @@ class HideShortsComponentsPatch : BytecodePatch(
         // Some Shorts buttons are views, hide them by setting their visibility to GONE.
         CreateShortsButtonsFingerprint.result?.let {
             ShortsButtons.values().forEach { button -> button.injectHideCall(it.mutableMethod) }
-        } ?: return CreateShortsButtonsFingerprint.toErrorResult()
+        } ?: throw CreateShortsButtonsFingerprint.toErrorResult()
 
         // endregion
 
@@ -94,7 +92,7 @@ class HideShortsComponentsPatch : BytecodePatch(
                     )
                 }
             }
-        } ?: return SetPivotBarVisibilityParentFingerprint.toErrorResult()
+        } ?: throw SetPivotBarVisibilityParentFingerprint.toErrorResult()
 
         // Hook to hide the navigation bar when Shorts are being played.
         RenderBottomNavigationBarParentFingerprint.result?.let {
@@ -104,7 +102,7 @@ class HideShortsComponentsPatch : BytecodePatch(
             RenderBottomNavigationBarFingerprint.result!!.mutableMethod.apply {
                 addInstruction(0, "invoke-static { }, $FILTER_CLASS_DESCRIPTOR->hideNavigationBar()V")
             }
-        } ?: return RenderBottomNavigationBarParentFingerprint.toErrorResult()
+        } ?: throw RenderBottomNavigationBarParentFingerprint.toErrorResult()
 
         // Required to prevent a black bar from appearing at the bottom of the screen.
         BottomNavigationBarFingerprint.result?.let {
@@ -119,11 +117,9 @@ class HideShortsComponentsPatch : BytecodePatch(
                             "hideNavigationBar(Landroid/view/View;)Landroid/view/View;"
                 )
             }
-        } ?: return BottomNavigationBarFingerprint.toErrorResult()
+        } ?: throw BottomNavigationBarFingerprint.toErrorResult()
 
         // endregion
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/resource/patch/HideShortsComponentsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/resource/patch/HideShortsComponentsResourcePatch.kt
index fb066424..5fe2678b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/resource/patch/HideShortsComponentsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/resource/patch/HideShortsComponentsResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.hide.shorts.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -13,7 +11,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 class HideShortsComponentsResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             PreferenceScreen(
                 "revanced_shorts_preference_screen",
@@ -94,8 +92,6 @@ class HideShortsComponentsResourcePatch : ResourcePatch {
 
         reelMultipleItemShelfId = "reel_multiple_items_shelf".getId()
         reelPlayerRightLargeIconSize = "reel_player_right_large_icon_size".getId()
-
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/patch/HideTimestampPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/patch/HideTimestampPatch.kt
index 8753a784..2246e561 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/patch/HideTimestampPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/patch/HideTimestampPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -27,7 +25,7 @@ class HideTimestampPatch : BytecodePatch(
         TimeCounterFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_timestamp",
@@ -49,8 +47,6 @@ class HideTimestampPatch : BytecodePatch(
                 nop
             """
             )
-        } ?: return TimeCounterFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw TimeCounterFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/patch/HideWatermarkPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/patch/HideWatermarkPatch.kt
index c9e5694e..e2b7f12f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/patch/HideWatermarkPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/watermark/patch/HideWatermarkPatch.kt
@@ -7,9 +7,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -30,7 +28,7 @@ class HideWatermarkPatch : BytecodePatch(
         HideWatermarkParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_video_watermark",
@@ -42,7 +40,7 @@ class HideWatermarkPatch : BytecodePatch(
 
         HideWatermarkFingerprint.resolve(context, HideWatermarkParentFingerprint.result!!.classDef)
         val result = HideWatermarkFingerprint.result
-            ?: return PatchResultError("Required parent method could not be found.")
+            ?: throw PatchException("Required parent method could not be found.")
 
         val method = result.mutableMethod
         val line = method.implementation!!.instructions.size - 5
@@ -55,7 +53,5 @@ class HideWatermarkPatch : BytecodePatch(
                 move-result p2
             """
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/patch/PlayerPopupPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/patch/PlayerPopupPanelsPatch.kt
index 1f5d4c7d..65445b88 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/patch/PlayerPopupPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/patch/PlayerPopupPanelsPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -27,7 +25,7 @@ class PlayerPopupPanelsPatch : BytecodePatch(
         EngagementPanelControllerFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_hide_player_popup_panels",
@@ -38,7 +36,7 @@ class PlayerPopupPanelsPatch : BytecodePatch(
         )
 
         val engagementPanelControllerMethod = EngagementPanelControllerFingerprint
-            .result?.mutableMethod ?: return EngagementPanelControllerFingerprint.toErrorResult()
+            .result?.mutableMethod ?: throw EngagementPanelControllerFingerprint.toErrorResult()
 
         engagementPanelControllerMethod.addInstructionsWithLabels(
             0,
@@ -53,7 +51,5 @@ class PlayerPopupPanelsPatch : BytecodePatch(
                 nop
             """
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/patch/PlayerControlsBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/patch/PlayerControlsBackgroundPatch.kt
index c074af39..5096eb77 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/patch/PlayerControlsBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/patch/PlayerControlsBackgroundPatch.kt
@@ -4,8 +4,6 @@ import app.revanced.extensions.doRecursively
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.player.background.annotations.PlayerControlsBackgroundCompatibility
@@ -16,7 +14,7 @@ import org.w3c.dom.Element
 @Description("Removes the background from the video player controls.")
 @PlayerControlsBackgroundCompatibility
 class PlayerControlsBackgroundPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         context.xmlEditor[RESOURCE_FILE_PATH].use { editor ->
             editor.file.doRecursively node@{ node ->
                 if (node !is Element) return@node
@@ -26,8 +24,6 @@ class PlayerControlsBackgroundPatch : ResourcePatch {
                 }
             }
         }
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt
index 230ad1c3..c73db88b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt
@@ -13,9 +13,7 @@ import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.layout.returnyoutubedislike.annotations.ReturnYouTubeDislikeCompatibility
@@ -51,7 +49,7 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
         RemoveLikeFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // region Inject newVideoLoaded event handler to update dislikes when a new video is loaded.
 
         VideoIdPatch.injectCall("$INTEGRATIONS_CLASS_DESCRIPTOR->newVideoLoaded(Ljava/lang/String;)V")
@@ -73,7 +71,7 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
                         invoke-static {v0}, $INTEGRATIONS_CLASS_DESCRIPTOR->sendVote(I)V
                     """
                 )
-            } ?: return PatchResultError("Failed to find ${fingerprint.name} method.")
+            } ?: throw PatchException("Failed to find ${fingerprint.name} method.")
         }
 
         // endregion
@@ -128,7 +126,7 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
                     """
                 )
             }
-        } ?: return TextComponentContextFingerprint.toErrorResult()
+        } ?: throw TextComponentContextFingerprint.toErrorResult()
 
         // endregion
 
@@ -168,7 +166,7 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
                     """
                 )
             }
-        } ?: return ShortsTextViewFingerprint.toErrorResult()
+        } ?: throw ShortsTextViewFingerprint.toErrorResult()
 
         // endregion
 
@@ -186,11 +184,9 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
                     "invoke-static {v$resourceIdentifierRegister, v$textViewRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->setOldUILayoutDislikes(ILandroid/widget/TextView;)V"
                 )
             }
-        } ?: return DislikesOldLayoutTextViewFingerprint.toErrorResult()
+        } ?: throw DislikesOldLayoutTextViewFingerprint.toErrorResult()
 
         // endregion
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/resource/patch/ReturnYouTubeDislikeResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/resource/patch/ReturnYouTubeDislikeResourcePatch.kt
index 75cd1915..304623ce 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/resource/patch/ReturnYouTubeDislikeResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/resource/patch/ReturnYouTubeDislikeResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -17,7 +15,7 @@ class ReturnYouTubeDislikeResourcePatch : ResourcePatch {
         internal var oldUIDislikeId: Long = -1
     }
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.addPreference(
             Preference(
                 StringResource("revanced_ryd_settings_title", "Return YouTube Dislike"),
@@ -31,7 +29,5 @@ class ReturnYouTubeDislikeResourcePatch : ResourcePatch {
         oldUIDislikeId = ResourceMappingPatch.resourceMappings.single {
             it.type == "id" && it.name == "dislike_button"
         }.id
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/patch/WideSearchbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/patch/WideSearchbarPatch.kt
index d31a5a25..d985edfd 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/patch/WideSearchbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/patch/WideSearchbarPatch.kt
@@ -4,12 +4,9 @@ import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -31,7 +28,7 @@ class WideSearchbarPatch : BytecodePatch(
         SetWordmarkHeaderFingerprint, CreateSearchSuggestionsFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_wide_searchbar",
@@ -41,7 +38,7 @@ class WideSearchbarPatch : BytecodePatch(
             )
         )
 
-        val result = CreateSearchSuggestionsFingerprint.result ?: return CreateSearchSuggestionsFingerprint.toErrorResult()
+        val result = CreateSearchSuggestionsFingerprint.result ?: throw CreateSearchSuggestionsFingerprint.toErrorResult()
 
         // patch methods
         mapOf(
@@ -50,8 +47,6 @@ class WideSearchbarPatch : BytecodePatch(
         ).forEach { (fingerprint, callIndex) ->
             context.walkMutable(callIndex, fingerprint).injectSearchBarHook()
         }
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/bytecode/patch/SeekbarColorBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/bytecode/patch/SeekbarColorBytecodePatch.kt
index f3b7dfc3..2ff0da1a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/bytecode/patch/SeekbarColorBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/bytecode/patch/SeekbarColorBytecodePatch.kt
@@ -4,12 +4,9 @@ import app.revanced.extensions.indexOfFirstConstantInstructionValue
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.layout.seekbar.annotations.SeekbarColorCompatibility
@@ -29,7 +26,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 class SeekbarColorBytecodePatch : BytecodePatch(
     listOf(PlayerSeekbarColorFingerprint, ShortsSeekbarColorFingerprint, SetSeekbarClickedColorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         fun MutableMethod.addColorChangeInstructions(resourceId: Long) {
             var registerIndex = indexOfFirstConstantInstructionValue(resourceId) + 2
             var colorRegister = getInstruction<OneRegisterInstruction>(registerIndex).registerA
@@ -45,11 +42,11 @@ class SeekbarColorBytecodePatch : BytecodePatch(
         PlayerSeekbarColorFingerprint.result?.mutableMethod?.apply {
             addColorChangeInstructions(SeekbarColorResourcePatch.inlineTimeBarColorizedBarPlayedColorDarkId)
             addColorChangeInstructions(SeekbarColorResourcePatch.inlineTimeBarPlayedNotHighlightedColorId)
-        } ?: return PlayerSeekbarColorFingerprint.toErrorResult()
+        } ?: throw PlayerSeekbarColorFingerprint.toErrorResult()
 
         ShortsSeekbarColorFingerprint.result?.mutableMethod?.apply {
             addColorChangeInstructions(SeekbarColorResourcePatch.reelTimeBarPlayedColorId)
-        } ?: return ShortsSeekbarColorFingerprint.toErrorResult()
+        } ?: throw ShortsSeekbarColorFingerprint.toErrorResult()
 
         SetSeekbarClickedColorFingerprint.result?.let { result ->
             result.mutableMethod.let {
@@ -70,11 +67,9 @@ class SeekbarColorBytecodePatch : BytecodePatch(
                     )
                 }
             }
-        } ?: return SetSeekbarClickedColorFingerprint.toErrorResult()
+        } ?: throw SetSeekbarClickedColorFingerprint.toErrorResult()
 
         lithoColorOverrideHook(INTEGRATIONS_CLASS_DESCRIPTOR, "getLithoColor")
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarColorResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarColorResourcePatch.kt
index c1201656..6991daaa 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarColorResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarColorResourcePatch.kt
@@ -1,7 +1,8 @@
 package app.revanced.patches.youtube.layout.seekbar.resource
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
@@ -10,11 +11,11 @@ import org.w3c.dom.Element
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 class SeekbarColorResourcePatch : ResourcePatch {
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         fun findColorResource(resourceName: String): Long {
             return ResourceMappingPatch.resourceMappings
                 .find { it.type == "color" && it.name == resourceName }?.id
-            ?: throw PatchResultError("Could not find color resource: $resourceName")
+            ?: throw PatchException("Could not find color resource: $resourceName")
         }
 
         reelTimeBarPlayedColorId =
@@ -29,7 +30,7 @@ class SeekbarColorResourcePatch : ResourcePatch {
             val layerList = editor.file.getElementsByTagName("layer-list").item(0) as Element
             val progressNode = layerList.getElementsByTagName("item").item(1) as Element
             if (!progressNode.getAttributeNode("android:id").value.endsWith("progress")) {
-                return PatchResultError("Could not find progress bar")
+                throw PatchException("Could not find progress bar")
             }
             val scaleNode = progressNode.getElementsByTagName("scale").item(0) as Element
             val shapeNode = scaleNode.getElementsByTagName("shape").item(0) as Element
@@ -37,8 +38,6 @@ class SeekbarColorResourcePatch : ResourcePatch {
                 "app.revanced.integrations.patches.theme.ProgressBarDrawable")
             scaleNode.replaceChild(replacementNode, shapeNode)
         }
-
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarPreferencesPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarPreferencesPatch.kt
index 17a3f168..84599bf6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarPreferencesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/resource/SeekbarPreferencesPatch.kt
@@ -12,11 +12,9 @@ import java.io.Closeable
 
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 class SeekbarPreferencesPatch : ResourcePatch, Closeable {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         // Nothing to do here. All work is done in close method.
-
-        return PatchResultSuccess()
     }
 
     override fun close() {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
index 4f00ba5b..12d0ebc9 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
@@ -4,16 +4,13 @@ import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -64,11 +61,11 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         AutoRepeatParentFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LayoutConstructorFingerprint.result?.let {
             if (!ControlsOverlayFingerprint.resolve(context, it.classDef))
                 throw ControlsOverlayFingerprint.toErrorResult()
-        } ?: return LayoutConstructorFingerprint.toErrorResult()
+        } ?: throw LayoutConstructorFingerprint.toErrorResult()
 
         /*
          * Hook the video time methods
@@ -222,7 +219,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
                     "invoke-static {v$frameLayoutRegister}, $INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR->initialize(Landroid/view/ViewGroup;)V"
                 )
             }
-        }  ?: return ControlsOverlayFingerprint.toErrorResult()
+        }  ?: throw ControlsOverlayFingerprint.toErrorResult()
 
         // get rectangle field name
         RectangleFieldInvalidatorFingerprint.resolve(context, seekbarSignatureResult.classDef)
@@ -255,23 +252,21 @@ class SponsorBlockBytecodePatch : BytecodePatch(
                         )
                     }
                 }
-            } ?: return PatchResultError("Could not find the method which contains the replaceMeWith* strings")
+            } ?: throw PatchException("Could not find the method which contains the replaceMeWith* strings")
 
 
         // The vote and create segment buttons automatically change their visibility when appropriate,
         // but if buttons are showing when the end of the video is reached then they will not automatically hide.
         // Add a hook to forcefully hide when the end of the video is reached.
-        AutoRepeatParentFingerprint.result ?: return AutoRepeatParentFingerprint.toErrorResult()
+        AutoRepeatParentFingerprint.result ?: throw AutoRepeatParentFingerprint.toErrorResult()
         AutoRepeatFingerprint.also {
             it.resolve(context, AutoRepeatParentFingerprint.result!!.classDef)
         }.result?.mutableMethod?.addInstruction(
             0,
             "invoke-static {}, $INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR->endOfVideoReached()V"
-        ) ?: return AutoRepeatFingerprint.toErrorResult()
+        ) ?: throw AutoRepeatFingerprint.toErrorResult()
 
         // TODO: isSBChannelWhitelisting implementation
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
index d579bbea..65d8a2de 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.sponsorblock.resource.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -17,7 +15,7 @@ import app.revanced.util.resources.ResourceUtils.mergeStrings
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 class SponsorBlockResourcePatch : ResourcePatch {
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.addPreference(
             Preference(
                 StringResource("revanced_sponsorblock_settings_title", "SponsorBlock"),
@@ -91,7 +89,5 @@ class SponsorBlockResourcePatch : ResourcePatch {
                 break
             }
         }.close() // close afterwards
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/bytecode/patch/SpoofAppVersionPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/bytecode/patch/SpoofAppVersionPatch.kt
index 9095bd71..bb67d77d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/bytecode/patch/SpoofAppVersionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/bytecode/patch/SpoofAppVersionPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.ArrayResource
@@ -30,7 +28,7 @@ class SpoofAppVersionPatch : BytecodePatch(
         SpoofAppVersionFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_spoof_app_version",
@@ -79,9 +77,7 @@ class SpoofAppVersionPatch : BytecodePatch(
                     move-result-object v$buildOverrideNameRegister
                 """
             )
-        } ?: return SpoofAppVersionFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw SpoofAppVersionFingerprint.toErrorResult()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/patch/DisableShortsOnStartupPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/patch/DisableShortsOnStartupPatch.kt
index 13f35534..b4f11b48 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/patch/DisableShortsOnStartupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/patch/DisableShortsOnStartupPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -26,7 +24,7 @@ class DisableShortsOnStartupPatch : BytecodePatch(
         UserWasInShortsFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_disable_resuming_shorts_player",
@@ -51,7 +49,5 @@ class DisableShortsOnStartupPatch : BytecodePatch(
                 nop
             """
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
index 22d5c122..9633ab96 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
@@ -4,14 +4,11 @@ import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -39,7 +36,7 @@ class TabletMiniPlayerPatch : BytecodePatch(
         MiniPlayerOverrideFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
                 "revanced_tablet_miniplayer",
@@ -50,7 +47,7 @@ class TabletMiniPlayerPatch : BytecodePatch(
         )
 
         // First resolve the fingerprints via the parent fingerprint.
-        MiniPlayerDimensionsCalculatorParentFingerprint.result ?: return MiniPlayerDimensionsCalculatorParentFingerprint.toErrorResult()
+        MiniPlayerDimensionsCalculatorParentFingerprint.result ?: throw MiniPlayerDimensionsCalculatorParentFingerprint.toErrorResult()
         val miniPlayerClass = MiniPlayerDimensionsCalculatorParentFingerprint.result!!.classDef
 
         /*
@@ -81,7 +78,7 @@ class TabletMiniPlayerPatch : BytecodePatch(
                         .filter { (_, instruction) -> instruction.opcode == Opcode.RETURN }
                         .map { (index, _) -> index }
 
-                    if (returnIndices.isEmpty()) throw PatchResultError("No return instructions found.")
+                    if (returnIndices.isEmpty()) throw PatchException("No return instructions found.")
 
                     // This method clobbers register p0 to return the value, calculate to override.
                     val returnedRegister = implementation.registerCount - parameters.size
@@ -92,14 +89,12 @@ class TabletMiniPlayerPatch : BytecodePatch(
             }
 
             return@let
-        } ?: return MiniPlayerOverrideFingerprint.toErrorResult()
+        } ?: throw MiniPlayerOverrideFingerprint.toErrorResult()
 
         /*
          * Size check return value override.
          */
         MiniPlayerResponseModelSizeCheckFingerprint.addProxyCall()
-
-        return PatchResultSuccess()
     }
 
     // Helper methods.
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/LithoColorHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/LithoColorHookPatch.kt
index 0bd734f3..826e155e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/LithoColorHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/LithoColorHookPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.layout.theme.annotations.ThemeCompatibility
 import app.revanced.patches.youtube.layout.theme.bytecode.fingerprints.LithoThemeFingerprint
@@ -16,14 +14,12 @@ import app.revanced.patches.youtube.layout.theme.bytecode.fingerprints.LithoThem
 @Description("Adds a hook to set color of Litho components.")
 @ThemeCompatibility
 class LithoColorHookPatch : BytecodePatch(listOf(LithoThemeFingerprint)) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LithoThemeFingerprint.result?.let {
             insertionIndex = it.scanResult.patternScanResult!!.endIndex - 1
             colorRegister = "p1"
             insertionMethod = it.mutableMethod
-        } ?: return LithoThemeFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw LithoThemeFingerprint.toErrorResult()
     }
     companion object {
         private var insertionIndex : Int = -1
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt
index c12180e2..eb2c81c0 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt
@@ -17,10 +17,8 @@ import app.revanced.patches.youtube.layout.theme.resource.ThemeResourcePatch
 @ThemeCompatibility
 class ThemeBytecodePatch : BytecodePatch() {
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LithoColorHookPatch.lithoColorOverrideHook(INTEGRATIONS_CLASS_DESCRIPTOR, "getValue")
-
-        return PatchResultSuccess()
     }
 
     companion object : OptionsContainer() {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/resource/ThemeResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/resource/ThemeResourcePatch.kt
index ecdbbb19..cf96bbdf 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/resource/ThemeResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/resource/ThemeResourcePatch.kt
@@ -1,9 +1,7 @@
 package app.revanced.patches.youtube.layout.theme.resource
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -19,7 +17,7 @@ import org.w3c.dom.Element
 
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class, SeekbarPreferencesPatch::class])
 class ThemeResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SeekbarPreferencesPatch.addPreferences(
             SwitchPreference(
                 "revanced_seekbar_custom_color",
@@ -85,13 +83,11 @@ class ThemeResourcePatch : ResourcePatch {
                             return@editSplashScreen
                         }
                     }
-                    return PatchResultError("Failed to modify launch screen")
+                    throw PatchException("Failed to modify launch screen")
                 }
             }
         }
 
-
-        return PatchResultSuccess()
     }
 
     private fun addColorResource(
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/annotations/AlternativeThumbnailsCompatibility.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/annotations/AlternativeThumbnailsCompatibility.kt
similarity index 79%
rename from src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/annotations/AlternativeThumbnailsCompatibility.kt
rename to src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/annotations/AlternativeThumbnailsCompatibility.kt
index fb59218d..ccef6fd5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/annotations/AlternativeThumbnailsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/annotations/AlternativeThumbnailsCompatibility.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.alternativethumbnails.annotations
+package app.revanced.patches.youtube.layout.thumbnails.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/CronetURLRequestCallbackOnFailureFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/CronetURLRequestCallbackOnFailureFingerprint.kt
similarity index 85%
rename from src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/CronetURLRequestCallbackOnFailureFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/CronetURLRequestCallbackOnFailureFingerprint.kt
index 281deb8b..4a1cd03c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/CronetURLRequestCallbackOnFailureFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/CronetURLRequestCallbackOnFailureFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.alternativethumbnails.bytecode.fingerprints
+package app.revanced.patches.youtube.layout.thumbnails.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/CronetURLRequestCallbackOnResponseStartedFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/CronetURLRequestCallbackOnResponseStartedFingerprint.kt
similarity index 88%
rename from src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/CronetURLRequestCallbackOnResponseStartedFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/CronetURLRequestCallbackOnResponseStartedFingerprint.kt
index bd295c73..8786cd6d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/CronetURLRequestCallbackOnResponseStartedFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/CronetURLRequestCallbackOnResponseStartedFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.alternativethumbnails.bytecode.fingerprints
+package app.revanced.patches.youtube.layout.thumbnails.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/CronetURLRequestCallbackOnSucceededFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/CronetURLRequestCallbackOnSucceededFingerprint.kt
similarity index 85%
rename from src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/CronetURLRequestCallbackOnSucceededFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/CronetURLRequestCallbackOnSucceededFingerprint.kt
index 516a1b1c..335a7911 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/CronetURLRequestCallbackOnSucceededFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/CronetURLRequestCallbackOnSucceededFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.alternativethumbnails.bytecode.fingerprints
+package app.revanced.patches.youtube.layout.thumbnails.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/MessageDigestImageUrlFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/MessageDigestImageUrlFingerprint.kt
similarity index 79%
rename from src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/MessageDigestImageUrlFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/MessageDigestImageUrlFingerprint.kt
index 53fc96ea..d7d8b780 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/MessageDigestImageUrlFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/MessageDigestImageUrlFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.alternativethumbnails.bytecode.fingerprints
+package app.revanced.patches.youtube.layout.thumbnails.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/MessageDigestImageUrlParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/MessageDigestImageUrlParentFingerprint.kt
similarity index 82%
rename from src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/MessageDigestImageUrlParentFingerprint.kt
rename to src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/MessageDigestImageUrlParentFingerprint.kt
index 1495650a..461bdb26 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/fingerprints/MessageDigestImageUrlParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/fingerprints/MessageDigestImageUrlParentFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.alternativethumbnails.bytecode.fingerprints
+package app.revanced.patches.youtube.layout.thumbnails.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/patch/AlternativeThumbnailsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/patch/AlternativeThumbnailsPatch.kt
similarity index 78%
rename from src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/patch/AlternativeThumbnailsPatch.kt
rename to src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/patch/AlternativeThumbnailsPatch.kt
index f24697ed..18ba5eb0 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/alternativethumbnails/bytecode/patch/AlternativeThumbnailsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/patch/AlternativeThumbnailsPatch.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.alternativethumbnails.bytecode.patch
+package app.revanced.patches.youtube.layout.thumbnails.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
@@ -8,23 +8,12 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.shared.settings.preference.impl.ArrayResource
-import app.revanced.patches.shared.settings.preference.impl.ListPreference
-import app.revanced.patches.shared.settings.preference.impl.NonInteractivePreference
-import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.alternativethumbnails.annotations.AlternativeThumbnailsCompatibility
-import app.revanced.patches.youtube.layout.alternativethumbnails.bytecode.fingerprints.CronetURLRequestCallbackOnFailureFingerprint
-import app.revanced.patches.youtube.layout.alternativethumbnails.bytecode.fingerprints.CronetURLRequestCallbackOnResponseStartedFingerprint
-import app.revanced.patches.youtube.layout.alternativethumbnails.bytecode.fingerprints.CronetURLRequestCallbackOnSucceededFingerprint
-import app.revanced.patches.youtube.layout.alternativethumbnails.bytecode.fingerprints.MessageDigestImageUrlFingerprint
-import app.revanced.patches.youtube.layout.alternativethumbnails.bytecode.fingerprints.MessageDigestImageUrlParentFingerprint
+import app.revanced.patches.shared.settings.preference.impl.*
+import app.revanced.patches.youtube.layout.thumbnails.annotations.AlternativeThumbnailsCompatibility
+import app.revanced.patches.youtube.layout.thumbnails.fingerprints.*
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
@@ -32,11 +21,11 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Name("Alternative thumbnails")
 @AlternativeThumbnailsCompatibility
-@Description("Adds an option to replace video thumbnails with still image captures of the video.")
+@Description("Adds options to replace video thumbnails with still image captures of the video.")
 class AlternativeThumbnailsPatch : BytecodePatch(
     listOf(MessageDigestImageUrlParentFingerprint, CronetURLRequestCallbackOnResponseStartedFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             PreferenceScreen(
                 "revanced_alt_thumbnails_preference_screen",
@@ -84,23 +73,23 @@ class AlternativeThumbnailsPatch : BytecodePatch(
         )
 
         MessageDigestImageUrlParentFingerprint.result
-            ?: return MessageDigestImageUrlParentFingerprint.toErrorResult()
+            ?: throw MessageDigestImageUrlParentFingerprint.toErrorResult()
         MessageDigestImageUrlFingerprint.resolve(context, MessageDigestImageUrlParentFingerprint.result!!.classDef)
         MessageDigestImageUrlFingerprint.result?.apply {
             loadImageUrlMethod = mutableMethod
-        } ?: return MessageDigestImageUrlFingerprint.toErrorResult()
+        } ?: throw MessageDigestImageUrlFingerprint.toErrorResult()
         addImageUrlHook(INTEGRATIONS_CLASS_DESCRIPTOR, true)
 
 
         CronetURLRequestCallbackOnResponseStartedFingerprint.result
-            ?: return CronetURLRequestCallbackOnResponseStartedFingerprint.toErrorResult()
+            ?: throw CronetURLRequestCallbackOnResponseStartedFingerprint.toErrorResult()
         CronetURLRequestCallbackOnSucceededFingerprint.resolve(
             context,
             CronetURLRequestCallbackOnResponseStartedFingerprint.result!!.classDef
         )
         CronetURLRequestCallbackOnSucceededFingerprint.result?.apply {
             loadImageSuccessCallbackMethod = mutableMethod
-        } ?: return CronetURLRequestCallbackOnSucceededFingerprint.toErrorResult()
+        } ?: throw CronetURLRequestCallbackOnSucceededFingerprint.toErrorResult()
         addImageUrlSuccessCallbackHook(INTEGRATIONS_CLASS_DESCRIPTOR)
 
 
@@ -110,10 +99,7 @@ class AlternativeThumbnailsPatch : BytecodePatch(
         )
         CronetURLRequestCallbackOnFailureFingerprint.result?.apply {
             loadImageErrorCallbackMethod = mutableMethod
-        } ?: return CronetURLRequestCallbackOnFailureFingerprint.toErrorResult()
-
-
-        return PatchResultSuccess()
+        } ?: throw CronetURLRequestCallbackOnFailureFingerprint.toErrorResult()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/patch/AutoRepeatPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/patch/AutoRepeatPatch.kt
index 42c2df57..dfdacc24 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/patch/AutoRepeatPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/patch/AutoRepeatPatch.kt
@@ -7,9 +7,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -30,7 +28,7 @@ class AutoRepeatPatch : BytecodePatch(
         AutoRepeatParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference(
                 "revanced_auto_repeat",
@@ -42,7 +40,7 @@ class AutoRepeatPatch : BytecodePatch(
 
         //Get Result from the ParentFingerprint which is the playMethod we need to get.
         val parentResult = AutoRepeatParentFingerprint.result
-            ?: return PatchResultError("ParentFingerprint did not resolve.")
+            ?: throw PatchException("ParentFingerprint did not resolve.")
 
         //this one needs to be called when app/revanced/integrations/patches/AutoRepeatPatch;->shouldAutoRepeat() returns true
         val playMethod = parentResult.mutableMethod
@@ -52,7 +50,7 @@ class AutoRepeatPatch : BytecodePatch(
 
         //This is the method we search for
         val result = AutoRepeatFingerprint.result
-            ?: return PatchResultError("FingerPrint did not resolve.")
+            ?: throw PatchException("FingerPrint did not resolve.")
         val method = result.mutableMethod
 
         //Instructions to add to the smali code
@@ -67,7 +65,7 @@ class AutoRepeatPatch : BytecodePatch(
 
         //Get the implementation so we can do a check for null and get instructions size.
         val implementation = method.implementation
-            ?: return PatchResultError("No Method Implementation found!")
+            ?: throw PatchException("No Method Implementation found!")
 
         //Since addInstructions needs an index which starts counting at 0 and size starts counting at 1,
         //we have to remove 1 to get the latest instruction
@@ -80,6 +78,5 @@ class AutoRepeatPatch : BytecodePatch(
         method.addInstructionsWithLabels(index, instructions)
 
         //Everything worked as expected, return Success
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookPatch.kt
index 8687029b..f197c578 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.youtube.misc.bottomsheet.hook.fingerprints.CreateBottomSheetFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
@@ -16,7 +14,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class BottomSheetHookPatch : BytecodePatch(
     listOf(CreateBottomSheetFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         CreateBottomSheetFingerprint.result?.let {
             it.mutableMethod.apply {
                 val returnLinearLayoutIndex = implementation!!.instructions.lastIndex
@@ -31,9 +29,7 @@ class BottomSheetHookPatch : BytecodePatch(
                     )
                 }
             }
-        } ?: return CreateBottomSheetFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw CreateBottomSheetFingerprint.toErrorResult()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookResourcePatch.kt
index bfb244df..14b434d6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/bottomsheet/hook/patch/BottomSheetHookResourcePatch.kt
@@ -1,20 +1,16 @@
 package app.revanced.patches.youtube.misc.bottomsheet.hook.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 
 @DependsOn([ResourceMappingPatch::class])
 class BottomSheetHookResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         bottomSheetMargins =  ResourceMappingPatch.resourceMappings.find { it.name == "bottom_sheet_margins" }?.id
-            ?: return PatchResultError("Could not find resource")
-
-        return PatchResultSuccess()
+            ?: throw PatchException("Could not find resource")
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt
index c3f1b7ed..1a1e45dd 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/patch/DebuggingPatch.kt
@@ -3,8 +3,6 @@ package app.revanced.patches.youtube.misc.debugging.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
@@ -20,7 +18,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 @Description("Adds debugging options.")
 @DebuggingCompatibility
 class DebuggingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             app.revanced.patches.shared.settings.preference.impl.PreferenceScreen(
                 "revanced_debug_preference_screen",
@@ -67,7 +65,5 @@ class DebuggingPatch : ResourcePatch {
                 StringResource("revanced_debug_preference_screen_summary", "Enable or disable debugging options")
             )
         )
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/patch/FixBackToExitGesturePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/patch/FixBackToExitGesturePatch.kt
index 152f9853..81f46eed 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/patch/FixBackToExitGesturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/patch/FixBackToExitGesturePatch.kt
@@ -7,9 +7,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.annotation.FixBackToExitGestureCompatibility
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.OnBackPressedFingerprint
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fingerprints.RecyclerViewScrollingFingerprint
@@ -25,12 +22,12 @@ class FixBackToExitGesturePatch : BytecodePatch(
         OnBackPressedFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         RecyclerViewTopScrollingFingerprint.apply {
             resolve(
                 context,
                 RecyclerViewTopScrollingParentFingerprint.result?.classDef
-                    ?: return RecyclerViewTopScrollingParentFingerprint.toErrorResult()
+                    ?: throw RecyclerViewTopScrollingParentFingerprint.toErrorResult()
             )
         }
 
@@ -44,15 +41,7 @@ class FixBackToExitGesturePatch : BytecodePatch(
             OnBackPressedFingerprint to IntegrationsMethod(
                 "p0", "onBackPressed", "Lcom/google/android/apps/youtube/app/watchwhile/WatchWhileActivity;"
             )
-        ).forEach { (fingerprint, target) ->
-            try {
-                fingerprint.injectCall(target)
-            } catch (error: PatchResultError) {
-                return error
-            }
-        }
-
-        return PatchResultSuccess()
+        ).forEach { (fingerprint, target) -> fingerprint.injectCall(target) }
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/ClientSpoofPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/ClientSpoofPatch.kt
index bb987b21..2135488c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/ClientSpoofPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/ClientSpoofPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.misc.fix.playback.annotations.ClientSpoofCompatibility
@@ -23,7 +21,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 class ClientSpoofPatch : BytecodePatch(
     listOf(UserAgentHeaderBuilderFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         UserAgentHeaderBuilderFingerprint.result?.let { result ->
             val insertIndex = result.scanResult.patternScanResult!!.endIndex
            result.mutableMethod.apply {
@@ -32,9 +30,7 @@ class ClientSpoofPatch : BytecodePatch(
                addInstruction(insertIndex, "const-string v$packageNameRegister, \"$ORIGINAL_PACKAGE_NAME\"")
            }
 
-        } ?: return UserAgentHeaderBuilderFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw UserAgentHeaderBuilderFingerprint.toErrorResult()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
index 0f486e63..4c8dee84 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
@@ -4,14 +4,11 @@ import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.misc.fix.playback.fingerprints.ProtobufParameterBuilderFingerprint
@@ -36,7 +33,7 @@ class SpoofSignatureVerificationPatch : BytecodePatch(
         ScrubbedPreviewLayoutFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         // hook parameter
         ProtobufParameterBuilderFingerprint.result?.let {
@@ -55,14 +52,14 @@ class SpoofSignatureVerificationPatch : BytecodePatch(
                     """
                 )
             }
-        } ?: return ProtobufParameterBuilderFingerprint.toErrorResult()
+        } ?: throw ProtobufParameterBuilderFingerprint.toErrorResult()
 
 
         // When signature spoofing is enabled, the seekbar when tapped does not show
         // the video time, chapter names, or the video thumbnail.
         // Changing the value returned of this method forces all of these to show up,
         // except the thumbnails are blank, which is handled with the patch below.
-        StoryboardThumbnailParentFingerprint.result ?: return StoryboardThumbnailParentFingerprint.toErrorResult()
+        StoryboardThumbnailParentFingerprint.result ?: throw StoryboardThumbnailParentFingerprint.toErrorResult()
         StoryboardThumbnailFingerprint.resolve(context, StoryboardThumbnailParentFingerprint.result!!.classDef)
         StoryboardThumbnailFingerprint.result?.apply {
             val endIndex = scanResult.patternScanResult!!.endIndex
@@ -84,7 +81,7 @@ class SpoofSignatureVerificationPatch : BytecodePatch(
                 return v0
             """
             )
-        } ?: return StoryboardThumbnailFingerprint.toErrorResult()
+        } ?: throw StoryboardThumbnailFingerprint.toErrorResult()
 
 
         // Seekbar thumbnail now show up but are always a blank image.
@@ -102,9 +99,7 @@ class SpoofSignatureVerificationPatch : BytecodePatch(
                 """
                 )
             }
-        } ?: return ScrubbedPreviewLayoutFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw ScrubbedPreviewLayoutFingerprint.toErrorResult()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationResourcePatch.kt
index c90bddb2..56a9f7be 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.misc.fix.playback.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -13,7 +11,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 class SpoofSignatureVerificationResourcePatch : ResourcePatch {
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference(
                 "revanced_spoof_signature_verification",
@@ -33,8 +31,6 @@ class SpoofSignatureVerificationResourcePatch : ResourcePatch {
         scrubbedPreviewThumbnailResourceId = ResourceMappingPatch.resourceMappings.single {
             it.type == "id" && it.name == "thumbnail"
         }.id
-
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/links/open/patch/OpenLinksExternallyPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/links/open/patch/OpenLinksExternallyPatch.kt
index 6340b126..7323c0f4 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/links/open/patch/OpenLinksExternallyPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/links/open/patch/OpenLinksExternallyPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
@@ -29,7 +27,7 @@ class OpenLinksExternallyPatch : BytecodePatch(
         InitializeCustomTabSupportFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference(
                 "revanced_external_browser",
@@ -44,7 +42,7 @@ class OpenLinksExternallyPatch : BytecodePatch(
             BindSessionServiceFingerprint,
             InitializeCustomTabSupportFingerprint
         ).forEach {
-            val result = it.result ?: return it.toErrorResult()
+            val result = it.result ?: throw it.toErrorResult()
             val insertIndex = result.scanResult.patternScanResult!!.endIndex + 1
             with(result.mutableMethod) {
                 val register = (implementation!!.instructions[insertIndex - 1] as Instruction21c).registerA
@@ -57,7 +55,5 @@ class OpenLinksExternallyPatch : BytecodePatch(
                 )
             }
         }
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt
index 69a174b5..ece9c0c0 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/patch/LithoFilterPatch.kt
@@ -12,8 +12,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
@@ -61,14 +59,14 @@ class LithoFilterPatch : BytecodePatch(
      *    }
      * }
      */
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ComponentContextParserFingerprint.result?.also {
             arrayOf(
                 EmptyComponentBuilderFingerprint,
                 ReadComponentIdentifierFingerprint
             ).forEach { fingerprint ->
                 if (fingerprint.resolve(context, it.mutableMethod, it.mutableClass)) return@forEach
-                return fingerprint.toErrorResult()
+                throw fingerprint.toErrorResult()
             }
         }?.let { bytesToComponentContextMethod ->
 
@@ -77,7 +75,7 @@ class LithoFilterPatch : BytecodePatch(
             ProtobufBufferReferenceFingerprint.result
                 ?.mutableMethod?.addInstruction(0,
                     " invoke-static { p2 }, $INTEGRATIONS_CLASS_DESCRIPTOR->setProtoBuffer(Ljava/nio/ByteBuffer;)V")
-                ?: return ProtobufBufferReferenceFingerprint.toErrorResult()
+                ?: throw ProtobufBufferReferenceFingerprint.toErrorResult()
 
             // endregion
 
@@ -143,7 +141,7 @@ class LithoFilterPatch : BytecodePatch(
             }
 
             // endregion
-        } ?: return ComponentContextParserFingerprint.toErrorResult()
+        } ?: throw ComponentContextParserFingerprint.toErrorResult()
 
         LithoFilterFingerprint.result?.mutableMethod?.apply {
             removeInstructions(2, 4) // Remove dummy filter.
@@ -159,9 +157,7 @@ class LithoFilterPatch : BytecodePatch(
                     """
                 )
             }
-        } ?: return LithoFilterFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw LithoFilterFingerprint.toErrorResult()
     }
 
     override fun close() = LithoFilterFingerprint.result!!
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
index 0833b12a..59296187 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt
@@ -4,8 +4,6 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.fingerprints.WatchWhileActivityFingerprint
@@ -40,7 +38,7 @@ class MicroGBytecodePatch : BytecodePatch(
         WatchWhileActivityFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // apply common microG patch
         MicroGBytecodeHelper.patchBytecode(
             context, arrayOf(
@@ -65,7 +63,5 @@ class MicroGBytecodePatch : BytecodePatch(
 
         // inject the notice for MicroG
         MicroGBytecodeHelper.injectNotice(WatchWhileActivityFingerprint)
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt
index 14bb6b61..0c07e4ab 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.misc.microg.patch.resource
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.settings.preference.impl.Preference
@@ -20,7 +18,7 @@ import app.revanced.util.microg.MicroGResourceHelper
 
 @DependsOn([SettingsResourcePatch::class])
 class MicroGResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.addPreference(
             Preference(
                 StringResource("microg_settings", "MicroG Settings"),
@@ -47,7 +45,5 @@ class MicroGResourcePatch : ResourcePatch {
 
         // add strings
         MicroGResourceHelper.addStrings(context)
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt
index c3d7a953..117e96b3 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt
@@ -4,13 +4,10 @@ import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -39,7 +36,7 @@ class MinimizedPlaybackPatch : BytecodePatch(
         KidsMinimizedPlaybackPolicyControllerFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // TODO: remove this empty preference sometime after mid 2023
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             NonInteractivePreference(
@@ -57,10 +54,10 @@ class MinimizedPlaybackPatch : BytecodePatch(
                     return v0
                 """
             )
-        } ?: return MinimizedPlaybackManagerFingerprint.toErrorResult()
+        } ?: throw MinimizedPlaybackManagerFingerprint.toErrorResult()
 
         // Enable minimized playback option in YouTube settings
-        MinimizedPlaybackSettingsParentFingerprint.result ?: return MinimizedPlaybackSettingsParentFingerprint.toErrorResult()
+        MinimizedPlaybackSettingsParentFingerprint.result ?: throw MinimizedPlaybackSettingsParentFingerprint.toErrorResult()
         MinimizedPlaybackSettingsFingerprint.resolve(context, MinimizedPlaybackSettingsParentFingerprint.result!!.classDef)
         MinimizedPlaybackSettingsFingerprint.result?.apply {
             val booleanCalls = method.implementation!!.instructions.withIndex()
@@ -78,7 +75,7 @@ class MinimizedPlaybackPatch : BytecodePatch(
                     return v0
                 """
             )
-        } ?: return MinimizedPlaybackSettingsFingerprint.toErrorResult()
+        } ?: throw MinimizedPlaybackSettingsFingerprint.toErrorResult()
 
         // Force allowing background play for videos labeled for kids.
         // Some regions and YouTube accounts do not require this patch.
@@ -87,9 +84,7 @@ class MinimizedPlaybackPatch : BytecodePatch(
                 0,
                 "return-void"
             )
-        } ?: return KidsMinimizedPlaybackPolicyControllerFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw KidsMinimizedPlaybackPolicyControllerFingerprint.toErrorResult()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt
index 41627635..924e1b24 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.fingerprints.LayoutConstructorFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.annotation.PlayerControlsCompatibility
@@ -28,16 +26,14 @@ class PlayerControlsBytecodePatch : BytecodePatch(
         BottomControlsInflateFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LayoutConstructorFingerprint.result?.let {
             if (!PlayerControlsVisibilityFingerprint.resolve(context, it.classDef))
                 throw LayoutConstructorFingerprint.toErrorResult()
-        } ?: return LayoutConstructorFingerprint.toErrorResult()
+        } ?: throw LayoutConstructorFingerprint.toErrorResult()
 
         showPlayerControlsFingerprintResult = PlayerControlsVisibilityFingerprint.result!!
         inflateFingerprintResult = BottomControlsInflateFingerprint.result!!
-
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt
index 0df6883f..9d57a112 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt
@@ -1,9 +1,7 @@
 package app.revanced.patches.youtube.misc.playercontrols.resource.patch
 
-import app.revanced.patcher.data.DomFileEditor
+import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -11,14 +9,12 @@ import java.io.Closeable
 
 @DependsOn([ResourceMappingPatch::class])
 class BottomControlsResourcePatch : ResourcePatch, Closeable {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         resourceContext = context
         targetXmlEditor = context.xmlEditor[TARGET_RESOURCE]
 
         bottomUiContainerResourceId = ResourceMappingPatch.resourceMappings
             .single { it.type == "id" && it.name == "bottom_ui_container_stub" }.id
-
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/patch/PlayerOverlaysHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/patch/PlayerOverlaysHookPatch.kt
index f78b879f..406c694e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/patch/PlayerOverlaysHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/patch/PlayerOverlaysHookPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playeroverlay.annotation.PlayerOverlaysHookCompatibility
@@ -21,13 +19,12 @@ class PlayerOverlaysHookPatch : BytecodePatch(
         PlayerOverlaysOnFinishInflateFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // hook YouTubePlayerOverlaysLayout.onFinishInflate()
         val method = PlayerOverlaysOnFinishInflateFingerprint.result!!.mutableMethod
         method.addInstruction(
             method.implementation!!.instructions.size - 2,
             "invoke-static { p0 }, Lapp/revanced/integrations/patches/PlayerOverlaysHookPatch;->YouTubePlayerOverlaysLayout_onFinishInflateHook(Ljava/lang/Object;)V"
         )
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/patch/PlayerTypeHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/patch/PlayerTypeHookPatch.kt
index 831482dc..48026b53 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/patch/PlayerTypeHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/patch/PlayerTypeHookPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playertype.fingerprint.PlayerTypeFingerprint
@@ -22,11 +20,11 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 class PlayerTypeHookPatch : BytecodePatch(
     listOf(PlayerTypeFingerprint, VideoStateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         PlayerTypeFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "invoke-static {p1}, $INTEGRATIONS_CLASS_DESCRIPTOR->setPlayerType(Ljava/lang/Enum;)V"
-        ) ?: return PlayerTypeFingerprint.toErrorResult()
+        ) ?: throw PlayerTypeFingerprint.toErrorResult()
 
         VideoStateFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -41,9 +39,7 @@ class PlayerTypeHookPatch : BytecodePatch(
                     """
                 )
             }
-        } ?: return VideoStateFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw VideoStateFingerprint.toErrorResult()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt
index 5d8aa1d0..c583373f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt
@@ -9,8 +9,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.settings.preference.impl.Preference
 import app.revanced.patches.shared.settings.util.AbstractPreferenceScreen
@@ -29,7 +27,7 @@ import java.io.Closeable
 class SettingsPatch : BytecodePatch(
     listOf(LicenseActivityFingerprint, SetThemeFingerprint)
 ), Closeable {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // TODO: Remove this when it is only required at one place.
         fun getSetThemeInstructionString(
             registers: String = "v0",
@@ -57,7 +55,7 @@ class SettingsPatch : BytecodePatch(
                         addInstruction(returnIndex + 1, "return-object v0")
                     }
                 }
-        } ?: return SetThemeFingerprint.toErrorResult()
+        } ?: throw SetThemeFingerprint.toErrorResult()
 
 
         // Modify the license activity and remove all existing layout code.
@@ -88,8 +86,6 @@ class SettingsPatch : BytecodePatch(
             }
         }
 
-
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsResourcePatch.kt
index 3b368351..e2a447c0 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsResourcePatch.kt
@@ -1,10 +1,8 @@
 package app.revanced.patches.youtube.misc.settings.resource.patch
 
-import app.revanced.patcher.data.DomFileEditor
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.shared.settings.preference.addPreference
 import app.revanced.patches.shared.settings.preference.impl.*
@@ -21,7 +19,7 @@ class SettingsResourcePatch : AbstractSettingsResourcePatch(
     "revanced_prefs",
     "settings"
 ) {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         super.execute(context)
 
         // Used for a fingerprint from SettingsPatch.
@@ -88,8 +86,6 @@ class SettingsResourcePatch : AbstractSettingsResourcePatch(
         )
 
         context.mergeStrings("settings/host/values/strings.xml")
-
-        return PatchResultSuccess()
     }
 
 
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt
index 719aa001..ad801b43 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
@@ -25,7 +23,7 @@ import app.revanced.patches.youtube.misc.zoomhaptics.fingerprints.ZoomHapticsFin
 class ZoomHapticsPatch : BytecodePatch(
     listOf(ZoomHapticsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference(
                 "revanced_disable_zoom_haptics",
@@ -47,7 +45,5 @@ class ZoomHapticsPatch : BytecodePatch(
             """,
             ExternalLabel("vibrate", zoomHapticsFingerprintMethod.getInstruction(0))
         )
-
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/patch/HDRBrightnessPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/patch/HDRBrightnessPatch.kt
index d8fb5d49..be339f03 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/patch/HDRBrightnessPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/patch/HDRBrightnessPatch.kt
@@ -5,8 +5,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -27,7 +25,7 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 class HDRBrightnessPatch : BytecodePatch(
     listOf(HDRBrightnessFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
             SwitchPreference(
                 "revanced_hdr_auto_brightness",
@@ -55,7 +53,5 @@ class HDRBrightnessPatch : BytecodePatch(
                 """
             )
         }
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/information/patch/VideoInformationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/information/patch/VideoInformationPatch.kt
index cb2ea76f..458aaf87 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/information/patch/VideoInformationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/information/patch/VideoInformationPatch.kt
@@ -4,15 +4,12 @@ import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
@@ -44,7 +41,7 @@ class VideoInformationPatch : BytecodePatch(
         OnPlaybackSpeedItemClickFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         with(PlayerInitFingerprint.result!!) {
             playerInitMethod = mutableClass.methods.first { MethodUtil.isConstructor(it) }
 
@@ -136,11 +133,9 @@ class VideoInformationPatch : BytecodePatch(
                 getReference(speedSelectionMethodInstructions, 1, Opcode.IGET)
             setPlaybackSpeedMethodReference =
                 getReference(speedSelectionMethodInstructions, 2, Opcode.IGET)
-        } ?: return OnPlaybackSpeedItemClickFingerprint.toErrorResult()
+        } ?: throw OnPlaybackSpeedItemClickFingerprint.toErrorResult()
 
         userSelectedPlaybackSpeedHook(INTEGRATIONS_CLASS_DESCRIPTOR, "userSelectedPlaybackSpeed")
-
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/RememberVideoQualityPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/RememberVideoQualityPatch.kt
index 8bd9abdd..f96b19c5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/RememberVideoQualityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/RememberVideoQualityPatch.kt
@@ -9,9 +9,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.ArrayResource
@@ -42,7 +40,7 @@ class RememberVideoQualityPatch : BytecodePatch(
         NewVideoQualityChangedFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // This is bloated as each value has it's own String key/value
         // ideally the entries would be raw values (and not a key to a String resource)
         val entries = listOf(
@@ -119,7 +117,7 @@ class RememberVideoQualityPatch : BytecodePatch(
         // Inject a call to set the remembered quality once a video loads.
         VideoQualitySetterFingerprint.result?.also {
             if (!SetQualityByIndexMethodClassFieldReferenceFingerprint.resolve(context, it.classDef))
-                return PatchResultError("Could not resolve fingerprint to find setQualityByIndex method")
+                throw PatchException("Could not resolve fingerprint to find setQualityByIndex method")
         }?.let {
             // This instruction refers to the field with the type that contains the setQualityByIndex method.
             val instructions = SetQualityByIndexMethodClassFieldReferenceFingerprint.result!!
@@ -139,7 +137,7 @@ class RememberVideoQualityPatch : BytecodePatch(
             // Get the name of the setQualityByIndex method.
             val setQualityByIndexMethod = setQualityByIndexMethodClass.methods
                 .find { method -> method.parameterTypes.first() == "I" }
-                ?: return PatchResultError("Could not find setQualityByIndex method")
+                ?: throw PatchException("Could not find setQualityByIndex method")
 
             it.mutableMethod.addInstructions(
                 0,
@@ -160,7 +158,7 @@ class RememberVideoQualityPatch : BytecodePatch(
                     move-result p2
                 """,
             )
-        } ?: return VideoQualitySetterFingerprint.toErrorResult()
+        } ?: throw VideoQualitySetterFingerprint.toErrorResult()
 
 
         // Inject a call to remember the selected quality.
@@ -174,8 +172,8 @@ class RememberVideoQualityPatch : BytecodePatch(
                     0,
                     "invoke-static {p$listItemIndexParameter}, $INTEGRATIONS_CLASS_DESCRIPTOR->userChangedQuality(I)V"
                 )
-            } ?: return PatchResultError("Failed to find onItemClick method")
-        } ?: return VideoQualityItemOnClickParentFingerprint.toErrorResult()
+            } ?: throw PatchException("Failed to find onItemClick method")
+        } ?: throw VideoQualityItemOnClickParentFingerprint.toErrorResult()
 
 
         // Remember video quality if not using old layout menu.
@@ -189,10 +187,8 @@ class RememberVideoQualityPatch : BytecodePatch(
                     "invoke-static {v$qualityRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->userChangedQualityInNewFlyout(I)V"
                 )
             }
-        } ?: return NewVideoQualityChangedFingerprint.toErrorResult()
+        } ?: throw NewVideoQualityChangedFingerprint.toErrorResult()
 
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeed.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeed.kt
index 5eb3a30a..895e43fa 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeed.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeed.kt
@@ -4,8 +4,6 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.video.speed.custom.patch.CustomPlaybackSpeedPatch
@@ -17,7 +15,6 @@ import app.revanced.patches.youtube.video.speed.remember.patch.RememberPlaybackS
 @DependsOn([CustomPlaybackSpeedPatch::class, RememberPlaybackSpeedPatch::class])
 @PlaybackSpeedCompatibility
 class PlaybackSpeed : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
-        return PatchResultSuccess() // All patches this patch depends on succeed.
+    override fun execute(context: BytecodeContext) { // All patches this patch depends on succeed.
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/patch/CustomPlaybackSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/patch/CustomPlaybackSpeedPatch.kt
index 509add41..74eb5f24 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/patch/CustomPlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/custom/patch/CustomPlaybackSpeedPatch.kt
@@ -11,9 +11,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patches.shared.settings.preference.impl.InputType
@@ -44,7 +42,7 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
     )
 ) {
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
             TextPreference(
                 key = "revanced_custom_playback_speeds",
@@ -66,7 +64,7 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
         val sizeCallIndex = arrayGenMethodImpl.instructions
             .indexOfFirst { ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "size" }
 
-        if (sizeCallIndex == -1) return PatchResultError("Couldn't find call to size()")
+        if (sizeCallIndex == -1) throw PatchException("Couldn't find call to size()")
 
         val sizeCallResultRegister =
             (arrayGenMethodImpl.instructions.elementAt(sizeCallIndex + 1) as OneRegisterInstruction).registerA
@@ -173,12 +171,10 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
                         invoke-virtual { v0 }, $showOldPlaybackSpeedMenuMethod
                     """
                 )
-            } ?: return ShowOldPlaybackSpeedMenuIntegrationsFingerprint.toErrorResult()
-        } ?: return GetOldPlaybackSpeedsFingerprint.toErrorResult()
+            } ?: throw ShowOldPlaybackSpeedMenuIntegrationsFingerprint.toErrorResult()
+        } ?: throw GetOldPlaybackSpeedsFingerprint.toErrorResult()
 
         // endregion
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt
index e1f3cfbb..368aa18d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.settings.preference.impl.ArrayResource
@@ -30,7 +28,7 @@ class RememberPlaybackSpeedPatch : BytecodePatch(
         InitializePlaybackSpeedValuesFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
             SwitchPreference(
                 "revanced_remember_playback_speed_last_selected",
@@ -105,9 +103,7 @@ class RememberPlaybackSpeedPatch : BytecodePatch(
                 """.trimIndent(),
                 ExternalLabel("do_not_override", mutableMethod.getInstruction(0))
             )
-        } ?: return InitializePlaybackSpeedValuesFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw InitializePlaybackSpeedValuesFingerprint.toErrorResult()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/videoid/patch/VideoIdPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/videoid/patch/VideoIdPatch.kt
index 6a178cb9..2f13f5c6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/videoid/patch/VideoIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/videoid/patch/VideoIdPatch.kt
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
@@ -25,7 +23,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class VideoIdPatch : BytecodePatch(
     listOf(VideoIdFingerprint, VideoIdFingerprintBackgroundPlay)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         /**
          * Supplies the method and register index of the video id register.
          *
@@ -53,8 +51,6 @@ class VideoIdPatch : BytecodePatch(
             backgroundPlaybackInsertIndex = insertIndex
             backgroundPlaybackVideoIdRegister = videoIdRegister
         }
-
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuPatch.kt
index d0111b2a..e10cca26 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.misc.bottomsheet.hook.patch.BottomSheetHookPatch
@@ -30,7 +28,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class OldVideoQualityMenuPatch : BytecodePatch(
     listOf(VideoQualityMenuViewInflateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // region Patch for the old type of the video quality menu.
 
         VideoQualityMenuViewInflateFingerprint.result?.let {
@@ -57,8 +55,6 @@ class OldVideoQualityMenuPatch : BytecodePatch(
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
 
         // endregion
-
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuResourcePatch.kt
index c74137a2..5c21965d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/patch/OldVideoQualityMenuResourcePatch.kt
@@ -1,9 +1,7 @@
 package app.revanced.patches.youtube.video.videoqualitymenu.patch
 
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
@@ -13,7 +11,7 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 
 @DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
 class OldVideoQualityMenuResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
             SwitchPreference(
                 "revanced_show_old_video_quality_menu",
@@ -24,12 +22,10 @@ class OldVideoQualityMenuResourcePatch : ResourcePatch {
         )
 
         fun findResource(name: String) = ResourceMappingPatch.resourceMappings.find { it.name == name }?.id
-            ?: throw PatchResultError("Could not find resource")
+            ?: throw PatchException("Could not find resource")
 
         // Used for the old type of the video quality menu.
         videoQualityBottomSheetListFragmentTitle = findResource("video_quality_bottom_sheet_list_fragment_title")
-
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt
index 30544e8c..2255c475 100644
--- a/src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt
@@ -7,8 +7,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch
@@ -26,7 +24,7 @@ class HideAdsPatch : BytecodePatch(
         ContainsAdFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ContainsAdFingerprint.result?.let { result ->
             result.mutableMethod.apply {
                 val insertIndex = result.scanResult.patternScanResult!!.endIndex + 1
@@ -56,8 +54,6 @@ class HideAdsPatch : BytecodePatch(
                     )
                 }
             }
-        } ?: return ContainsAdFingerprint.toErrorResult()
-
-        return PatchResultSuccess()
+        } ?: throw ContainsAdFingerprint.toErrorResult()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/yuka/misc/unlockpremium/patch/UnlockPremiunPatch.kt b/src/main/kotlin/app/revanced/patches/yuka/misc/unlockpremium/patch/UnlockPremiunPatch.kt
index e409dd08..3c5aaf45 100644
--- a/src/main/kotlin/app/revanced/patches/yuka/misc/unlockpremium/patch/UnlockPremiunPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/yuka/misc/unlockpremium/patch/UnlockPremiunPatch.kt
@@ -6,8 +6,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.yuka.misc.unlockpremium.annotations.UnlockPremiumCompatibility
 import app.revanced.patches.yuka.misc.unlockpremium.fingerprints.IsPremiumFingerprint
@@ -23,7 +21,7 @@ class UnlockPremiunPatch : BytecodePatch(
     )
 ) {
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         IsPremiumFingerprint.resolve(context,YukaUserConstructorFingerprint.result!!.classDef)
         val method = IsPremiumFingerprint.result!!.mutableMethod
         method.addInstructions(
@@ -33,7 +31,6 @@ class UnlockPremiunPatch : BytecodePatch(
                 return v0
             """
         )
-        return PatchResultSuccess()
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/util/microg/MicroGBytecodeHelper.kt b/src/main/kotlin/app/revanced/util/microg/MicroGBytecodeHelper.kt
index 866d3678..a7606fca 100644
--- a/src/main/kotlin/app/revanced/util/microg/MicroGBytecodeHelper.kt
+++ b/src/main/kotlin/app/revanced/util/microg/MicroGBytecodeHelper.kt
@@ -1,11 +1,11 @@
 package app.revanced.util.microg
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.util.microg.Constants.ACTIONS
@@ -219,25 +219,25 @@ internal object MicroGBytecodeHelper {
      */
     private fun List<MethodFingerprint>.returnEarly() {
         this.forEach { fingerprint ->
-            if (fingerprint.result == null) throw PatchResultError(fingerprint.toString())
-            val result = fingerprint.result!!
-            val stringInstructions = when (result.method.returnType.first()) {
-                'L' -> """
+            fingerprint.result?.let { result ->
+                val stringInstructions = when (result.method.returnType.first()) {
+                    'L' -> """
                         const/4 v0, 0x0
                         return-object v0
                         """
 
-                'V' -> "return-void"
-                'I' -> """
+                    'V' -> "return-void"
+                    'I' -> """
                         const/4 v0, 0x0
                         return v0
                         """
 
-                else -> throw Exception("This case should never happen.")
-            }
-            result.mutableMethod.addInstructions(
-                0, stringInstructions
-            )
+                    else -> throw Exception("This case should never happen.")
+                }
+                result.mutableMethod.addInstructions(
+                    0, stringInstructions
+                )
+            } ?: throw fingerprint.toErrorResult()
         }
     }
 }
diff --git a/src/main/kotlin/app/revanced/util/patch/AbstractTransformInstructionsPatch.kt b/src/main/kotlin/app/revanced/util/patch/AbstractTransformInstructionsPatch.kt
index 1d51b33d..bf2e58a4 100644
--- a/src/main/kotlin/app/revanced/util/patch/AbstractTransformInstructionsPatch.kt
+++ b/src/main/kotlin/app/revanced/util/patch/AbstractTransformInstructionsPatch.kt
@@ -3,8 +3,6 @@ package app.revanced.util.patch
 import app.revanced.extensions.findMutableMethodOf
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.iface.Method
@@ -28,7 +26,7 @@ internal abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch()
         }
     }
 
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // Find all methods to patch
         buildMap {
             context.classes.forEach { classDef ->
@@ -62,7 +60,5 @@ internal abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch()
                 }
             }
         }
-
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/util/resources/ResourceUtils.kt b/src/main/kotlin/app/revanced/util/resources/ResourceUtils.kt
index be6a7748..6bee9e6d 100644
--- a/src/main/kotlin/app/revanced/util/resources/ResourceUtils.kt
+++ b/src/main/kotlin/app/revanced/util/resources/ResourceUtils.kt
@@ -1,7 +1,7 @@
 package app.revanced.util.resources
 
-import app.revanced.patcher.data.DomFileEditor
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.util.DomFileEditor
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import org.w3c.dom.Node