From 994c5d197db1ef4ade8e60b0ce95601acdacdb5b Mon Sep 17 00:00:00 2001
From: inotia00 <ars258000@gmail.com>
Date: Tue, 5 Sep 2023 01:37:09 +0900
Subject: [PATCH] build: bump patcher to 14.2.2

---
 build.gradle.kts                              | 17 ++---
 .../app/revanced/extensions/Extensions.kt     | 27 ++++++--
 .../kotlin/app/revanced/meta/JsonGenerator.kt |  3 -
 .../app/revanced/meta/PatchesFileGenerator.kt | 19 +++--
 .../app/revanced/meta/ReadmeGenerator.kt      | 69 -------------------
 .../music/ads/music/patch/MusicAdsPatch.kt    |  7 +-
 .../music/layout/amoled/patch/AmoledPatch.kt  |  7 +-
 .../patch/DisableAutoCaptionsPatch.kt         | 11 +--
 .../patch/BlackNavigationBarPatch.kt          | 11 +--
 .../icon/patch/CustomBrandingIconMMTPatch.kt  |  7 +-
 .../CustomBrandingIconRevancifyBluePatch.kt   |  7 +-
 .../CustomBrandingIconRevancifyRedPatch.kt    |  7 +-
 .../name/patch/CustomBrandingNamePatch.kt     | 13 ++--
 .../name/patch/RemoveElementsPatch.kt         |  5 +-
 .../buttonshelf/patch/HideButtonShelfPatch.kt |  7 +-
 .../patch/HideCarouselShelfPatch.kt           |  7 +-
 .../castbutton/patch/HideCastButtonPatch.kt   | 13 ++--
 .../categorybar/patch/CategoryBarPatch.kt     | 11 +--
 .../patch/HideChannelGuidelinesPatch.kt       |  7 +-
 .../patch/ColorMatchPlayerPatch.kt            | 13 ++--
 .../compactdialog/patch/CompactDialogPatch.kt | 12 +---
 .../customfilter/patch/CustomFilterPatch.kt   |  7 +-
 .../patch/NewPlaylistButtonPatch.kt           | 13 ++--
 .../landscapemode/patch/LandScapeModePatch.kt | 11 +--
 .../patch/MinimizedPlayerPatch.kt             | 11 +--
 .../patch/NavigationLabelPatch.kt             | 15 ++--
 .../layout/newlayout/patch/NewLayoutPatch.kt  | 11 +--
 .../patch/OldStyleMiniPlayerPatch.kt          | 15 ++--
 .../patch/HidePlaylistCardPatch.kt            |  7 +-
 .../sleeptimer/patch/SleepTimerPatch.kt       | 11 +--
 .../layout/zenmode/patch/ZenModePatch.kt      | 13 ++--
 .../patch/BackgroundPlayPatch.kt              | 12 +---
 .../bitrate/patch/BitrateDefaultValuePatch.kt |  7 +-
 .../misc/codecs/patch/CodecsUnlockPatch.kt    |  7 +-
 .../misc/debugging/patch/DebuggingPatch.kt    |  7 +-
 .../patch/ExclusiveAudioPatch.kt              | 11 +--
 .../patch/MinimizedPlaybackPatch.kt           | 11 +--
 .../patch/OptimizeResourcePatch.kt            |  7 +-
 .../misc/premium/patch/HideGetPremiumPatch.kt | 14 ++--
 .../misc/quality/patch/VideoQualityPatch.kt   | 15 ++--
 .../patch/ShareButtonHookPatch.kt             | 17 ++---
 .../misc/shuffle/patch/EnforceShufflePatch.kt | 17 ++---
 .../tastebuilder/patch/TasteBuilderPatch.kt   | 11 +--
 .../translations/patch/TranslationsPatch.kt   |  7 +-
 .../upgradebutton/patch/UpgradeButtonPatch.kt | 13 ++--
 .../patch/SpoofAppVersionPatch.kt             |  7 +-
 .../patch/AndroidAutoCertificatePatch.kt      | 11 +--
 .../patch/ClientSpoofMusicPatch.kt            |  9 +--
 .../utils/fix/decoding/patch/DecodingPatch.kt |  5 +-
 .../utils/litho/patch/LithoFilterPatch.kt     | 11 +--
 .../microg/bytecode/patch/MicroGPatch.kt      | 15 ++--
 .../resource/patch/MicroGResourcePatch.kt     | 11 ++-
 .../resourceid/patch/SharedResourceIdPatch.kt |  9 +--
 .../bytecode/patch/SettingsBytecodePatch.kt   | 11 ++-
 .../settings/resource/patch/SettingsPatch.kt  |  7 +-
 .../music/utils/videoid/patch/VideoIdPatch.kt |  9 +--
 .../reddit/ad/banner/patch/HideBannerPatch.kt |  5 +-
 .../ad/comments/patch/HideCommentAdsPatch.kt  | 10 +--
 .../reddit/ad/general/patch/HideAdsPatch.kt   | 19 ++---
 .../patch/NavigationButtonsPatch.kt           | 11 +--
 .../layout/place/patch/PlaceButtonPatch.kt    | 11 +--
 .../premiumicon/patch/PremiumIconPatch.kt     | 11 +--
 .../patch/ScreenshotPopupPatch.kt             | 11 +--
 .../openlink/patch/OpenLinksDirectlyPatch.kt  | 11 +--
 .../patch/OpenLinksExternallyPatch.kt         | 11 +--
 .../url/patch/SanitizeUrlQueryPatch.kt        | 11 +--
 .../utils/fix/decoding/patch/DecodingPatch.kt |  5 +-
 .../resourceid/patch/SharedResourceIdPatch.kt |  9 +--
 .../bytecode/patch/SettingsBytecodePatch.kt   | 13 ++--
 .../settings/resource/patch/SettingsPatch.kt  | 11 +--
 .../shared/patch/ads/AbstractAdsPatch.kt      | 10 +--
 .../integrations/AbstractIntegrationsPatch.kt | 32 +++------
 .../patch/litho/ComponentParserPatch.kt       | 15 ++--
 .../patch/mapping/ResourceMappingPatch.kt     |  5 +-
 .../patch/opus/AbstractOpusCodecsPatch.kt     | 15 ++--
 .../patch/packagename/PackageNamePatch.kt     |  7 +-
 .../settings/AbstractSettingsResourcePatch.kt |  5 +-
 .../versionspoof/AbstractVersionSpoofPatch.kt | 13 ++--
 .../bytecode/patch/GeneralAdsBytecodePatch.kt |  5 +-
 .../general/resource/patch/GeneralAdsPatch.kt |  7 +-
 .../getpremium/patch/HideGetPremiumPatch.kt   |  9 +--
 .../youtube/ads/video/patch/VideoAdsPatch.kt  |  7 +-
 .../patch/ButtonContainerPatch.kt             |  7 +-
 .../comment/patch/CommentComponentPatch.kt    |  7 +-
 .../feed/patch/FeedFlyoutPanelPatch.kt        | 15 ++--
 .../patch/OldQualityLayoutPatch.kt            | 13 ++--
 .../patch/OldSpeedLayoutPatch.kt              | 15 ++--
 .../player/patch/PlayerFlyoutPanelPatch.kt    |  7 +-
 .../patch/HideAutoplayPreviewPatch.kt         | 11 +--
 .../patch/CompactControlsOverlayPatch.kt      | 12 +---
 .../patch/HideEndScreenOverlayPatch.kt        | 11 +--
 .../patch/HideFullscreenPanelsPatch.kt        | 13 ++--
 .../landscapemode/patch/LandScapeModePatch.kt | 13 ++--
 .../quickactions/patch/QuickActionsPatch.kt   |  7 +-
 .../accountmenu/patch/AccountMenuPatch.kt     | 13 ++--
 .../autocaptions/patch/AutoCaptionsPatch.kt   | 13 ++--
 .../patch/PlayerPopupPanelsPatch.kt           | 11 +--
 .../categorybar/patch/CategoryBarPatch.kt     | 11 +--
 .../patch/ChannelListSubMenuPatch.kt          | 11 +--
 .../patch/CrowdfundingBoxPatch.kt             | 11 +--
 .../patch/DescriptionComponentsPatch.kt       |  7 +-
 .../patch/FloatingMicrophonePatch.kt          | 11 +--
 .../headerswitch/patch/HeaderSwitchPatch.kt   |  7 +-
 .../patch/LatestVideosButtonPatch.kt          | 11 +--
 .../layout/patch/LayoutComponentsPatch.kt     |  7 +-
 .../patch/LoadMoreButtonPatch.kt              | 11 +--
 .../mixplaylists/patch/MixPlaylistsPatch.kt   | 13 ++--
 .../patch/HideEmailAddressPatch.kt            | 11 +--
 .../snackbar/patch/HideSnackBarPatch.kt       | 11 +--
 .../patch/SuggestionsShelfPatch.kt            | 13 ++--
 .../patch/TabletMiniPlayerPatch.kt            | 18 ++---
 .../patch/TrendingSearchesPatch.kt            | 11 +--
 .../widesearchbar/patch/WideSearchBarPatch.kt | 12 +---
 .../icon/patch/CustomBrandingIconMMTPatch.kt  |  7 +-
 .../CustomBrandingIconRevancifyBluePatch.kt   |  7 +-
 .../CustomBrandingIconRevancifyRedPatch.kt    |  7 +-
 .../name/patch/CustomBrandingNamePatch.kt     | 11 +--
 .../name/patch/RemoveElementsPatch.kt         |  5 +-
 .../patch/DoubleTapOverlayBackgroundPatch.kt  |  7 +-
 .../patch/DoubleTapLengthPatch.kt             | 11 +--
 .../patch/PlayerButtonBackgroundPatch.kt      |  7 +-
 .../forceheader/patch/PremiumHeadingPatch.kt  | 14 ++--
 .../materialyou/patch/MaterialYouPatch.kt     |  7 +-
 .../optimize/patch/OptimizeResourcePatch.kt   |  7 +-
 .../optimize/patch/RedundantResourcePatch.kt  |  5 +-
 .../patch/PiPNotificationPatch.kt             | 11 +--
 .../patch/AddSplashAnimationPatch.kt          |  7 +-
 .../layout/theme/patch/GeneralThemePatch.kt   |  5 +-
 .../youtube/layout/theme/patch/ThemePatch.kt  | 11 +--
 .../tooltip/patch/TooltipContentViewPatch.kt  | 11 +--
 .../ambientmode/patch/PowerSaveModePatch.kt   | 15 ++--
 .../misc/debugging/patch/DebuggingPatch.kt    |  7 +-
 .../patch/ExternalBrowserPatch.kt             | 11 +--
 .../forceopus/patch/ForceOpusCodecPatch.kt    |  7 +-
 .../misc/forcevp9/patch/ForceVP9CodecPatch.kt | 21 +++---
 .../language/patch/LanguageSelectorPatch.kt   | 11 +--
 .../layoutswitch/patch/LayoutSwitchPatch.kt   | 16 ++---
 .../patch/MinimizedPlaybackPatch.kt           | 12 +---
 .../patch/OpenLinksDirectlyPatch.kt           | 11 +--
 .../misc/quic/patch/QUICProtocolPatch.kt      | 11 +--
 .../patch/NewSplashAnimationPatch.kt          | 11 +--
 .../patch/SpoofAppVersionPatch.kt             |  7 +-
 .../translations/patch/TranslationsPatch.kt   |  7 +-
 .../homepage/patch/ChangeHomePagePatch.kt     | 13 ++--
 .../label/patch/NavigationLabelPatch.kt       | 13 ++--
 .../patch/NavigationButtonsPatch.kt           | 15 ++--
 .../patch/TabletNavigationBarPatch.kt         | 11 +--
 .../alwaysrepeat/patch/AlwaysRepeatPatch.kt   | 14 ++--
 .../patch/DownloadButtonHookPatch.kt          |  9 +--
 .../general/patch/OverlayButtonsPatch.kt      |  7 +-
 .../patch/HideAutoplayButtonPatch.kt          | 11 +--
 .../patch/HideCaptionsButtonPatch.kt          | 11 +--
 .../castbutton/patch/HideCastButtonPatch.kt   | 11 +--
 .../patch/HideCollapseButtonPatch.kt          |  7 +-
 .../patch/HideEndScreenCardsPatch.kt          | 11 +--
 .../patch/HideFilmstripOverlayPatch.kt        | 15 ++--
 .../patch/HapticFeedBackPatch.kt              | 11 +--
 .../infocards/patch/HideInfoCardsPatch.kt     | 11 +--
 .../musicbutton/patch/HideMusicButtonPatch.kt | 11 +--
 .../patch/HidePlayerButtonBackgroundPatch.kt  | 11 +--
 .../patch/PlayerOverlayFilterPatch.kt         | 15 ++--
 .../patch/HidePreviousNextButtonPatch.kt      |  7 +-
 .../seekmessage/patch/SeekMessagePatch.kt     | 11 +--
 .../patch/HideSpeedOverlayPatch.kt            | 11 +--
 .../patch/SuggestedActionsPatch.kt            | 11 +--
 .../patch/SuggestedVideoOverlayPatch.kt       | 19 ++---
 .../patch/HideChannelWatermarkPatch.kt        | 13 ++--
 .../seekbar/seekbar/patch/HideSeekbarPatch.kt | 13 ++--
 .../seekbarcolor/patch/SeekbarColorPatch.kt   | 20 ++----
 .../seekbar/speed/patch/AppendSpeedPatch.kt   | 15 ++--
 .../tapping/patch/SeekbarTappingPatch.kt      | 13 ++--
 .../patch/NewThumbnailPreviewPatch.kt         | 11 +--
 .../timestamps/patch/HideTimeStampPatch.kt    | 11 +--
 .../patch/NewCommentPopupPanelsPatch.kt       | 11 +--
 .../patch/ShortsCommentButtonPatch.kt         |  9 +--
 .../patch/ShortsComponentPatch.kt             |  7 +-
 .../patch/ShortsDislikeButtonPatch.kt         |  9 +--
 .../patch/ShortsInfoPanelPatch.kt             |  9 +--
 .../patch/ShortsLikeButtonPatch.kt            |  9 +--
 .../patch/ShortsPaidPromotionBannerPatch.kt   |  9 +--
 .../patch/ShortsRemixButtonPatch.kt           |  9 +--
 .../patch/ShortsShareButtonPatch.kt           |  9 +--
 .../patch/ShortsSubscriptionsButtonPatch.kt   | 16 ++---
 .../patch/ShortsToolBarPatch.kt               | 14 ++--
 .../patch/ShortsNavigationBarPatch.kt         | 16 ++---
 .../patch/DisableShortsOnStartupPatch.kt      | 11 +--
 .../hdrbrightness/patch/HDRBrightnessPatch.kt |  9 +--
 .../patch/SwipeControlsBytecodePatch.kt       | 13 ++--
 .../resource/patch/SwipeControlsPatch.kt      |  7 +-
 .../fix/clientspoof/patch/ClientSpoofPatch.kt |  9 +--
 .../patch/DoubleBackToClosePatch.kt           | 16 ++---
 .../patch/SpoofPlayerParameterPatch.kt        | 18 ++---
 .../swiperefresh/patch/SwipeRefreshPatch.kt   |  9 +--
 .../utils/litho/patch/LithoFilterPatch.kt     | 16 ++---
 .../utils/litho/patch/LithoThemePatch.kt      |  9 +--
 .../bytecode/patch/MicroGBytecodePatch.kt     | 11 ++-
 .../microg/resource/patch/MicroGPatch.kt      | 13 ++--
 .../navbarindex/patch/NavBarIndexHookPatch.kt | 13 ++--
 .../patch/OverrideSpeedHookPatch.kt           | 16 ++---
 .../patch/PlayerButtonHookPatch.kt            |  9 +--
 .../patch/PlayerControlsPatch.kt              | 29 ++++----
 .../playertype/patch/PlayerTypeHookPatch.kt   | 13 ++--
 .../patch/QuickActionsHookPatch.kt            |  9 +--
 .../resourceid/patch/SharedResourceIdPatch.kt |  9 +--
 .../patch/ReturnYouTubeDislikePatch.kt        | 19 ++---
 .../ReturnYouTubeDislikeOldLayoutPatch.kt     |  9 +--
 .../patch/ReturnYouTubeDislikeShortsPatch.kt  |  9 +--
 .../bytecode/patch/SettingsBytecodePatch.kt   |  9 +--
 .../settings/resource/patch/SettingsPatch.kt  |  7 +-
 .../patch/SponsorBlockBytecodePatch.kt        | 21 +++---
 .../patch/SponsorBlockResourcePatch.kt        |  7 +-
 .../utils/videocpn/patch/VideoCpnPatch.kt     |  9 +--
 .../videoid/general/patch/VideoIdPatch.kt     | 20 +++---
 .../patch/VideoIdWithoutShortsPatch.kt        |  9 +--
 .../patch/CustomPlaybackSpeedPatch.kt         | 13 ++--
 .../video/hdr/patch/DisableHdrVideoPatch.kt   | 12 +---
 .../video/quality/patch/VideoQualityPatch.kt  | 21 +++---
 .../video/speed/patch/PlaybackSpeedPatch.kt   | 13 ++--
 .../util/microg/MicroGBytecodeHelper.kt       |  6 +-
 .../revanced/util/resources/ResourceUtils.kt  | 13 ++--
 220 files changed, 727 insertions(+), 1763 deletions(-)
 delete mode 100644 src/main/kotlin/app/revanced/meta/ReadmeGenerator.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 7375b76ec..ca2ca1399 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,30 +2,31 @@ plugins {
     kotlin("jvm") version "1.9.0"
 }
 
-group = "io.github.inotia00"
+group = "app.revanced"
+
+val githubUsername: String = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
 
 repositories {
     google()
     mavenCentral()
     mavenLocal()
-    maven { url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots") }
     maven {
-        url = uri("https://repo.sleeping.town")
-        content {
-            includeGroup("com.unascribed")
+        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
+        credentials {
+            username = githubUsername
+            password = githubPassword
         }
     }
 }
 
 dependencies {
-    implementation("io.github.inotia00:revanced-patcher:11.0.6-SNAPSHOT")
+    implementation("app.revanced:revanced-patcher:14.2.2")
     implementation("com.android.tools.smali:smali:3.0.3")
     implementation("com.android.tools.smali:smali-dexlib2:3.0.3")
 
     // Required for meta
     implementation("com.google.code.gson:gson:2.10.1")
-    // Required for FlexVer-Java
-    implementation("com.unascribed:flexver-java:1.1.0")
 }
 
 tasks {
diff --git a/src/main/kotlin/app/revanced/extensions/Extensions.kt b/src/main/kotlin/app/revanced/extensions/Extensions.kt
index fa3cf899e..47881ca3b 100644
--- a/src/main/kotlin/app/revanced/extensions/Extensions.kt
+++ b/src/main/kotlin/app/revanced/extensions/Extensions.kt
@@ -1,8 +1,9 @@
 package app.revanced.extensions
 
+import app.revanced.patcher.data.BytecodeContext
 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.MutableField
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -25,13 +26,13 @@ internal fun MutableMethodImplementation.injectHideCall(
     )
 }
 
-// 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].
  */
-fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
+val MethodFingerprint.exception
+    get() = PatchException("Failed to resolve $name")
 
 /**
  * Find the [MutableMethod] from a given [Method] in a [MutableClass].
@@ -65,6 +66,22 @@ fun MutableClass.transformFields(transform: MutableField.() -> MutableField) {
     fields.addAll(transformedFields)
 }
 
+/**
+ * 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)
+    }
+}
+
 internal fun Node.doRecursively(action: (Node) -> Unit) {
     action(this)
     for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
diff --git a/src/main/kotlin/app/revanced/meta/JsonGenerator.kt b/src/main/kotlin/app/revanced/meta/JsonGenerator.kt
index cebf57d91..3be7793f8 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 62667a331..23c1d100f 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(), ReadmeGenerator()).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/meta/ReadmeGenerator.kt b/src/main/kotlin/app/revanced/meta/ReadmeGenerator.kt
deleted file mode 100644
index c6c9124b8..000000000
--- a/src/main/kotlin/app/revanced/meta/ReadmeGenerator.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package app.revanced.meta
-
-import app.revanced.patcher.data.Context
-import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
-import app.revanced.patcher.extensions.PatchExtensions.description
-import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.patch.Patch
-import com.unascribed.flexver.FlexVerComparator
-import java.io.File
-
-internal class ReadmeGenerator : PatchesFileGenerator {
-    private companion object {
-        private const val TABLE_HEADER =
-            "| \uD83D\uDC8A Patch | \uD83D\uDCDC Description | \uD83C\uDFF9 Target Version |\n" +
-                    "|:--------:|:--------------:|:-----------------:|"
-    }
-
-    override fun generate(bundle: PatchBundlePatches) {
-        val output = StringBuilder()
-
-        mutableMapOf<String, MutableList<Class<out Patch<Context>>>>()
-            .apply {
-                for (patch in bundle) {
-                    patch.compatiblePackages?.forEach { pkg ->
-                        if (!contains(pkg.name)) put(pkg.name, mutableListOf())
-                        this[pkg.name]!!.add(patch)
-                    }
-                }
-            }
-            .entries
-            .sortedByDescending { it.value.size }
-            .forEach { (`package`, patches) ->
-                val mostCommonVersion = buildMap {
-                    patches.forEach { patch ->
-                        patch.compatiblePackages?.single { compatiblePackage -> compatiblePackage.name == `package` }?.versions?.let {
-                            it.forEach { version -> merge(version, 1, Integer::sum) }
-                        }
-                    }
-                }.let { commonMap ->
-                    commonMap.maxByOrNull { it.value }?.value?.let {
-                        commonMap.entries.filter { mostCommon -> mostCommon.value == it }
-                            .maxOfWith(FlexVerComparator::compare, Map.Entry<String, Int>::key)
-                    } ?: "all"
-                }
-
-                output.apply {
-                    appendLine("### [\uD83D\uDCE6 `${`package`}`](https://play.google.com/store/apps/details?id=${`package`})")
-                    appendLine("<details>\n")
-                    appendLine(TABLE_HEADER)
-                    patches.forEach { patch ->
-                        val recommendedPatchVersion = if (
-                            patch.compatiblePackages?.single { it.name == `package` }?.versions?.isNotEmpty() == true
-                        ) mostCommonVersion else "all"
-
-                        appendLine(
-                            "| `${patch.patchName.lowercase().replace(" ", "-")}` " +
-                                    "| ${patch.description} " +
-                                    "| $recommendedPatchVersion |"
-                        )
-                    }
-                    appendLine("</details>\n")
-                }
-            }
-
-        StringBuilder(File("README-template.md").readText())
-            .replace(Regex("\\{\\{\\s?table\\s?}}"), output.toString())
-            .let(File("README.md")::writeText)
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/ads/music/patch/MusicAdsPatch.kt b/src/main/kotlin/app/revanced/patches/music/ads/music/patch/MusicAdsPatch.kt
index a6921b5fe..1dab950ea 100644
--- a/src/main/kotlin/app/revanced/patches/music/ads/music/patch/MusicAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/ads/music/patch/MusicAdsPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.ads.music.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-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.music.utils.annotations.MusicCompatibility
@@ -25,18 +22,16 @@ import app.revanced.util.integrations.Constants.MUSIC_ADS_PATH
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class MusicAdsPatch : AbstractAdsPatch(
     "$MUSIC_ADS_PATH/HideMusicAdsPatch;->hideMusicAds()Z"
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         super.execute(context)
 
         SettingsPatch.addMusicPreference(CategoryType.ADS, "revanced_hide_music_ads", "true")
 
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/amoled/patch/AmoledPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/amoled/patch/AmoledPatch.kt
index 1cf58b184..4ef4ad804 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/amoled/patch/AmoledPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/amoled/patch/AmoledPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.layout.amoled.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.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
@@ -18,9 +15,8 @@ import org.w3c.dom.Element
 @Description("Applies pure black theme in flyout panels.")
 @DependsOn([DecodingPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class AmoledPatch : 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
@@ -37,6 +33,5 @@ class AmoledPatch : ResourcePatch {
             }
         }
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/autocaptions/patch/DisableAutoCaptionsPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/autocaptions/patch/DisableAutoCaptionsPatch.kt
index 9c6391031..315325f7f 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/autocaptions/patch/DisableAutoCaptionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/autocaptions/patch/DisableAutoCaptionsPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.music.layout.autocaptions.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.utils.annotations.MusicCompatibility
@@ -24,11 +21,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Disables forced auto captions.")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class DisableAutoCaptionsPatch : BytecodePatch(
     listOf(SubtitleTrackFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SubtitleTrackFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -42,7 +38,7 @@ class DisableAutoCaptionsPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return SubtitleTrackFingerprint.toErrorResult()
+        } ?: throw SubtitleTrackFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -50,6 +46,5 @@ class DisableAutoCaptionsPatch : BytecodePatch(
             "false"
         )
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/patch/BlackNavigationBarPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/patch/BlackNavigationBarPatch.kt
index 4e9d72827..d57f3439c 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/patch/BlackNavigationBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/patch/BlackNavigationBarPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.music.layout.blacknavigationbar.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.layout.blacknavbar.fingerprints.TabLayoutFingerprint
@@ -30,11 +27,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class BlackNavigationBarPatch : BytecodePatch(
     listOf(TabLayoutFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         TabLayoutFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -48,7 +44,7 @@ class BlackNavigationBarPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return TabLayoutFingerprint.toErrorResult()
+        } ?: throw TabLayoutFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -56,6 +52,5 @@ class BlackNavigationBarPatch : BytecodePatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt
index 008c46c69..e9c176494 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.layout.branding.icon.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.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
@@ -19,14 +16,12 @@ import app.revanced.util.resources.IconHelper.customIconMusicAdditional
 @Description("Changes the YouTube Music launcher icon to MMT.")
 @DependsOn([DecodingPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class CustomBrandingIconMMTPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         context.customIconMusic("mmt")
         context.customIconMusicAdditional("mmt")
 
-        return PatchResultSuccess()
     }
 
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt
index 82343e323..21773f666 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.layout.branding.icon.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.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
@@ -18,13 +15,11 @@ import app.revanced.util.resources.IconHelper.customIconMusic
 @Description("Changes the YouTube Music launcher icon to Revancify Blue.")
 @DependsOn([DecodingPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class CustomBrandingIconRevancifyBluePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         context.customIconMusic("revancify-blue")
 
-        return PatchResultSuccess()
     }
 
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt
index 92d9b7ec3..061f0222a 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.layout.branding.icon.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.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
@@ -18,13 +15,11 @@ import app.revanced.util.resources.IconHelper.customIconMusic
 @Description("Changes the YouTube Music launcher icon to Revancify Red.")
 @DependsOn([DecodingPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class CustomBrandingIconRevancifyRedPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         context.customIconMusic("revancify-red")
 
-        return PatchResultSuccess()
     }
 
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/CustomBrandingNamePatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/CustomBrandingNamePatch.kt
index 4ff4848a2..50aa1ae46 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/CustomBrandingNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/CustomBrandingNamePatch.kt
@@ -2,13 +2,10 @@ package app.revanced.patches.music.layout.branding.name.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.OptionsContainer
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.PatchOption
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-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
@@ -25,15 +22,14 @@ import app.revanced.patches.music.utils.fix.decoding.patch.DecodingPatch
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class CustomBrandingNamePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         val longName = MusicLongName
-            ?: throw PatchResultError("Invalid app name.")
+            ?: throw PatchException("Invalid app name.")
 
         val shortName = MusicShortName
-            ?: throw PatchResultError("Invalid app name.")
+            ?: throw PatchException("Invalid app name.")
 
         context.xmlEditor["res/values/strings.xml"].use { editor ->
             val document = editor.file
@@ -51,7 +47,6 @@ class CustomBrandingNamePatch : ResourcePatch {
             }
         }
 
-        return PatchResultSuccess()
     }
 
     companion object : OptionsContainer() {
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/RemoveElementsPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/RemoveElementsPatch.kt
index 1ebbd2b79..52661b398 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/RemoveElementsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/branding/name/patch/RemoveElementsPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.music.layout.branding.name.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 kotlin.io.path.exists
 
 class RemoveElementsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         LANGUAGE_LIST.forEach { path ->
             val resDirectory = context["res"]
@@ -24,7 +22,6 @@ class RemoveElementsPatch : ResourcePatch {
             }
         }
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/buttonshelf/patch/HideButtonShelfPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/buttonshelf/patch/HideButtonShelfPatch.kt
index 8e9bb099d..92be5a160 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/buttonshelf/patch/HideButtonShelfPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/buttonshelf/patch/HideButtonShelfPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.music.layout.buttonshelf.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.utils.annotations.MusicCompatibility
@@ -25,9 +22,8 @@ import app.revanced.util.integrations.Constants.MUSIC_ADS_PATH
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class HideButtonShelfPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -37,7 +33,6 @@ class HideButtonShelfPatch : BytecodePatch() {
 
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/carouselshelf/patch/HideCarouselShelfPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/carouselshelf/patch/HideCarouselShelfPatch.kt
index 4f77a6c5e..529f20029 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/carouselshelf/patch/HideCarouselShelfPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/carouselshelf/patch/HideCarouselShelfPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.music.layout.carouselshelf.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.utils.annotations.MusicCompatibility
@@ -25,9 +22,8 @@ import app.revanced.util.integrations.Constants.MUSIC_ADS_PATH
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class HideCarouselShelfPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -37,7 +33,6 @@ class HideCarouselShelfPatch : BytecodePatch() {
 
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/castbutton/patch/HideCastButtonPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/castbutton/patch/HideCastButtonPatch.kt
index 2fbe1c16a..e60d8c40c 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/castbutton/patch/HideCastButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/castbutton/patch/HideCastButtonPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.music.layout.castbutton.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.layout.castbutton.fingerprints.HideCastButtonFingerprint
@@ -24,11 +21,10 @@ import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
 @Description("Hides the cast button in the video player and header.")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class HideCastButtonPatch : BytecodePatch(
     listOf(HideCastButtonParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         HideCastButtonParentFingerprint.result?.let { parentResult ->
             HideCastButtonFingerprint.also {
@@ -41,8 +37,8 @@ class HideCastButtonPatch : BytecodePatch(
                     invoke-static {p1}, $MUSIC_LAYOUT->hideCastButton(I)I
                     move-result p1
                 """
-            ) ?: return HideCastButtonFingerprint.toErrorResult()
-        } ?: return HideCastButtonParentFingerprint.toErrorResult()
+            ) ?: throw HideCastButtonFingerprint.exception
+        } ?: throw HideCastButtonParentFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -50,6 +46,5 @@ class HideCastButtonPatch : BytecodePatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/categorybar/patch/CategoryBarPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/categorybar/patch/CategoryBarPatch.kt
index 7611fb50f..baa152c86 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/categorybar/patch/CategoryBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/categorybar/patch/CategoryBarPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.music.layout.categorybar.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.layout.categorybar.fingerprints.ChipCloudFingerprint
@@ -30,11 +27,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class CategoryBarPatch : BytecodePatch(
     listOf(ChipCloudFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ChipCloudFingerprint.result?.let {
             it.mutableMethod.apply {
                 val targetIndex = it.scanResult.patternScanResult!!.endIndex
@@ -45,7 +41,7 @@ class CategoryBarPatch : BytecodePatch(
                     "invoke-static { v$targetRegister }, $MUSIC_LAYOUT->hideCategoryBar(Landroid/view/View;)V"
                 )
             }
-        } ?: return ChipCloudFingerprint.toErrorResult()
+        } ?: throw ChipCloudFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -53,6 +49,5 @@ class CategoryBarPatch : BytecodePatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/channelguidelines/patch/HideChannelGuidelinesPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/channelguidelines/patch/HideChannelGuidelinesPatch.kt
index 2b9b01c7d..2701fea88 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/channelguidelines/patch/HideChannelGuidelinesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/channelguidelines/patch/HideChannelGuidelinesPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.music.layout.carouselshelf.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.utils.annotations.MusicCompatibility
@@ -25,9 +22,8 @@ import app.revanced.util.integrations.Constants.MUSIC_ADS_PATH
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class HideChannelGuidelinesPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -37,7 +33,6 @@ class HideChannelGuidelinesPatch : BytecodePatch() {
 
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/patch/ColorMatchPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/patch/ColorMatchPlayerPatch.kt
index a80671759..aec173aa8 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/patch/ColorMatchPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/patch/ColorMatchPlayerPatch.kt
@@ -1,17 +1,14 @@
 package app.revanced.patches.music.layout.colormatchplayer.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -30,11 +27,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 @Description("Matches the color of the mini player and the fullscreen player.")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class ColorMatchPlayerPatch : BytecodePatch(
     listOf(ColorMatchPlayerParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         ColorMatchPlayerParentFingerprint.result?.let { parentResult ->
             ColorMatchPlayerFingerprint.also {
@@ -74,8 +70,8 @@ class ColorMatchPlayerPatch : BytecodePatch(
                     )
                     removeInstruction(insertIndex - 1)
                 }
-            } ?: return ColorMatchPlayerFingerprint.toErrorResult()
-        } ?: return ColorMatchPlayerParentFingerprint.toErrorResult()
+            } ?: throw ColorMatchPlayerFingerprint.exception
+        } ?: throw ColorMatchPlayerParentFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -83,7 +79,6 @@ class ColorMatchPlayerPatch : BytecodePatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/compactdialog/patch/CompactDialogPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/compactdialog/patch/CompactDialogPatch.kt
index 70ba37c4b..93cb4c140 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/compactdialog/patch/CompactDialogPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/compactdialog/patch/CompactDialogPatch.kt
@@ -1,15 +1,11 @@
 package app.revanced.patches.music.layout.compactdialog.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -30,11 +26,10 @@ import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class CompactDialogPatch : BytecodePatch(
     listOf(DialogSolidFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         DialogSolidFingerprint.result?.let {
             with(
                 context
@@ -49,7 +44,7 @@ class CompactDialogPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return DialogSolidFingerprint.toErrorResult()
+        } ?: throw DialogSolidFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -57,6 +52,5 @@ class CompactDialogPatch : BytecodePatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/customfilter/patch/CustomFilterPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/customfilter/patch/CustomFilterPatch.kt
index 4e51685ad..4a873d751 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/customfilter/patch/CustomFilterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/customfilter/patch/CustomFilterPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.layout.customfilter.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.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
@@ -25,9 +22,8 @@ import app.revanced.util.integrations.Constants.MUSIC_ADS_PATH
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class CustomFilterPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -42,7 +38,6 @@ class CustomFilterPatch : ResourcePatch {
 
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/patch/NewPlaylistButtonPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/patch/NewPlaylistButtonPatch.kt
index 03e9f4e76..d54d6e511 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/patch/NewPlaylistButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/patch/NewPlaylistButtonPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.music.layout.floatingbutton.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 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
@@ -32,11 +29,10 @@ import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class NewPlaylistButtonPatch : BytecodePatch(
     listOf(FloatingButtonParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         FloatingButtonParentFingerprint.result?.let { parentResult ->
             FloatingButtonFingerprint.also {
@@ -55,8 +51,8 @@ class NewPlaylistButtonPatch : BytecodePatch(
                             """, ExternalLabel("show", getInstruction(1))
                     )
                 }
-            } ?: return FloatingButtonFingerprint.toErrorResult()
-        } ?: return FloatingButtonParentFingerprint.toErrorResult()
+            } ?: throw FloatingButtonFingerprint.exception
+        } ?: throw FloatingButtonParentFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -64,6 +60,5 @@ class NewPlaylistButtonPatch : BytecodePatch(
             "false"
         )
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/patch/LandScapeModePatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/patch/LandScapeModePatch.kt
index b79021690..72088dfcc 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/patch/LandScapeModePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/patch/LandScapeModePatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.music.layout.landscapemode.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.layout.landscapemode.fingerprints.TabletIdentifierFingerprint
@@ -28,11 +25,10 @@ import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class LandScapeModePatch : BytecodePatch(
     listOf(TabletIdentifierFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         TabletIdentifierFingerprint.result?.let {
             it.mutableMethod.addInstructions(
                 it.scanResult.patternScanResult!!.endIndex + 1, """
@@ -40,7 +36,7 @@ class LandScapeModePatch : BytecodePatch(
                     move-result p0
                     """
             )
-        } ?: return TabletIdentifierFingerprint.toErrorResult()
+        } ?: throw TabletIdentifierFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -48,6 +44,5 @@ class LandScapeModePatch : BytecodePatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/patch/MinimizedPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/patch/MinimizedPlayerPatch.kt
index e65d43bd0..4e34ce391 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/patch/MinimizedPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/patch/MinimizedPlayerPatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.music.layout.minimizedplayer.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.layout.minimizedplayer.fingerprints.MinimizedPlayerFingerprint
@@ -23,11 +20,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Permanently keep player minimized even if another track is played.")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class MinimizedPlayerPatch : BytecodePatch(
     listOf(MinimizedPlayerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         MinimizedPlayerFingerprint.result?.let {
             with(it.mutableMethod) {
@@ -42,7 +38,7 @@ class MinimizedPlayerPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return MinimizedPlayerFingerprint.toErrorResult()
+        } ?: throw MinimizedPlayerFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -50,6 +46,5 @@ class MinimizedPlayerPatch : BytecodePatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/patch/NavigationLabelPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/patch/NavigationLabelPatch.kt
index 28e589487..a60ee9d20 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/patch/NavigationLabelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/patch/NavigationLabelPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.music.layout.navigationlabel.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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.music.layout.navigationlabel.fingerprints.TabLayoutTextFingerprint
@@ -35,11 +32,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class NavigationLabelPatch : BytecodePatch(
     listOf(TabLayoutTextFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         TabLayoutTextFingerprint.result?.let {
             it.mutableMethod.apply {
                 val targetIndex = getWideLiteralIndex(Text1) + 3
@@ -47,14 +43,14 @@ class NavigationLabelPatch : BytecodePatch(
                 val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
 
                 if (!targetParameter.toString().endsWith("Landroid/widget/TextView;"))
-                    return PatchResultError("Method signature parameter did not match: $targetParameter")
+                    throw PatchException("Method signature parameter did not match: $targetParameter")
 
                 addInstruction(
                     targetIndex + 1,
                     "invoke-static {v$targetRegister}, $MUSIC_LAYOUT->hideNavigationLabel(Landroid/widget/TextView;)V"
                 )
             }
-        } ?: return TabLayoutTextFingerprint.toErrorResult()
+        } ?: throw TabLayoutTextFingerprint.exception
 
         contexts.xmlEditor[RESOURCE_FILE_PATH].use { editor ->
             val document = editor.file
@@ -74,7 +70,6 @@ class NavigationLabelPatch : BytecodePatch(
             "false"
         )
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/newlayout/patch/NewLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/newlayout/patch/NewLayoutPatch.kt
index a65c8afa6..86f25120b 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/newlayout/patch/NewLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/newlayout/patch/NewLayoutPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.music.layout.newlayout.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.layout.newlayout.fingerprints.NewLayoutFingerprint
@@ -24,11 +21,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Enable new player layouts. (YT Music v5.47.51+)")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class NewLayoutPatch : BytecodePatch(
     listOf(NewLayoutFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         NewLayoutFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -42,7 +38,7 @@ class NewLayoutPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return NewLayoutFingerprint.toErrorResult()
+        } ?: throw NewLayoutFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -50,6 +46,5 @@ class NewLayoutPatch : BytecodePatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt
index a6cbd44a8..544b643ee 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.music.layout.oldstyleminiplayer.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.music.layout.oldstyleminiplayer.fingerprints.NextButtonVisibilityFingerprint
@@ -27,14 +24,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Return the miniplayers to old style. (for YT Music v5.55.53+)")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class OldStyleMiniPlayerPatch : BytecodePatch(
     listOf(
         ColorMatchPlayerParentFingerprint,
         SwipeToCloseFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         ColorMatchPlayerParentFingerprint.result?.let { parentResult ->
             NextButtonVisibilityFingerprint.also {
@@ -55,8 +51,8 @@ class OldStyleMiniPlayerPatch : BytecodePatch(
                             """
                     )
                 }
-            } ?: return NextButtonVisibilityFingerprint.toErrorResult()
-        } ?: return ColorMatchPlayerParentFingerprint.toErrorResult()
+            } ?: throw NextButtonVisibilityFingerprint.exception
+        } ?: throw ColorMatchPlayerParentFingerprint.exception
 
         SwipeToCloseFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -70,7 +66,7 @@ class OldStyleMiniPlayerPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return SwipeToCloseFingerprint.toErrorResult()
+        } ?: throw SwipeToCloseFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -78,6 +74,5 @@ class OldStyleMiniPlayerPatch : BytecodePatch(
             "false"
         )
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/playlistcard/patch/HidePlaylistCardPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/playlistcard/patch/HidePlaylistCardPatch.kt
index 8d6ccf8c6..6353639f8 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/playlistcard/patch/HidePlaylistCardPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/playlistcard/patch/HidePlaylistCardPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.music.layout.playlistcard.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.utils.annotations.MusicCompatibility
@@ -25,9 +22,8 @@ import app.revanced.util.integrations.Constants.MUSIC_ADS_PATH
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class HidePlaylistCardPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -37,7 +33,6 @@ class HidePlaylistCardPatch : BytecodePatch() {
 
         LithoFilterPatch.addFilter(FILTER_CLASS_DESCRIPTOR)
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/patch/SleepTimerPatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/patch/SleepTimerPatch.kt
index a5b59c662..70ca0223a 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/patch/SleepTimerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/patch/SleepTimerPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.music.layout.sleeptimer.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.layout.sleeptimer.fingerprints.SleepTimerFingerprint
@@ -24,11 +21,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Add sleep timer to flyout menu.")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class SleepTimerPatch : BytecodePatch(
     listOf(SleepTimerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SleepTimerFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -42,7 +38,7 @@ class SleepTimerPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return SleepTimerFingerprint.toErrorResult()
+        } ?: throw SleepTimerFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -50,6 +46,5 @@ class SleepTimerPatch : BytecodePatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/layout/zenmode/patch/ZenModePatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/zenmode/patch/ZenModePatch.kt
index 0ba99b86d..527fa9445 100644
--- a/src/main/kotlin/app/revanced/patches/music/layout/zenmode/patch/ZenModePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/zenmode/patch/ZenModePatch.kt
@@ -1,17 +1,14 @@
 package app.revanced.patches.music.layout.zenmode.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.layout.zenmode.fingerprints.ZenModeFingerprint
@@ -28,11 +25,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 @Description("Adds a grey tint to the video player to reduce eye strain.")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class ZenModePatch : BytecodePatch(
     listOf(ColorMatchPlayerParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         ColorMatchPlayerParentFingerprint.result?.let { parentResult ->
             ZenModeFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let {
@@ -65,8 +61,8 @@ class ZenModePatch : BytecodePatch(
                     )
                     removeInstruction(referenceIndex)
                 }
-            } ?: return ZenModeFingerprint.toErrorResult()
-        } ?: return ColorMatchPlayerParentFingerprint.toErrorResult()
+            } ?: throw ZenModeFingerprint.exception
+        } ?: throw ColorMatchPlayerParentFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.LAYOUT,
@@ -74,6 +70,5 @@ class ZenModePatch : BytecodePatch(
             "false"
         )
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/backgroundplay/patch/BackgroundPlayPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/backgroundplay/patch/BackgroundPlayPatch.kt
index e132d1eaa..5d4717850 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/backgroundplay/patch/BackgroundPlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/backgroundplay/patch/BackgroundPlayPatch.kt
@@ -1,15 +1,11 @@
 package app.revanced.patches.music.misc.backgroundplay.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -22,11 +18,10 @@ import app.revanced.patches.music.utils.fix.decoding.patch.DecodingPatch
 @Description("Enables playing music in the background.")
 @DependsOn([DecodingPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class BackgroundPlayPatch : BytecodePatch(
     listOf(BackgroundPlaybackParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         BackgroundPlaybackParentFingerprint.result?.let {
             with(
@@ -42,8 +37,7 @@ class BackgroundPlayPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return BackgroundPlaybackParentFingerprint.toErrorResult()
+        } ?: throw BackgroundPlaybackParentFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/bitrate/patch/BitrateDefaultValuePatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/bitrate/patch/BitrateDefaultValuePatch.kt
index 9ff52d10e..e97885e00 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/bitrate/patch/BitrateDefaultValuePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/bitrate/patch/BitrateDefaultValuePatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.misc.bitrate.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.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
@@ -17,9 +14,8 @@ import app.revanced.patches.music.utils.fix.decoding.patch.DecodingPatch
 @Description("Set the audio quality to \"Always High\" when you first install the app.")
 @DependsOn([DecodingPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class BitrateDefaultValuePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         context.xmlEditor[RESOURCE_FILE_PATH].use { editor ->
             editor.file.getElementsByTagName("com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat")
                 .item(0).childNodes.apply {
@@ -39,7 +35,6 @@ class BitrateDefaultValuePatch : ResourcePatch {
                 }
         }
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/codecs/patch/CodecsUnlockPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/codecs/patch/CodecsUnlockPatch.kt
index 8fdd9dbcb..2297985c8 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/codecs/patch/CodecsUnlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/codecs/patch/CodecsUnlockPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.misc.codecs.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-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.music.utils.annotations.MusicCompatibility
@@ -19,11 +16,10 @@ import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
 @Description("Enable opus codec when playing audio.")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class CodecsUnlockPatch : AbstractOpusCodecsPatch(
     "$MUSIC_MISC_PATH/OpusCodecPatch;->enableOpusCodec()Z"
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         super.execute(context)
 
         SettingsPatch.addMusicPreference(
@@ -32,6 +28,5 @@ class CodecsUnlockPatch : AbstractOpusCodecsPatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/debugging/patch/DebuggingPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/debugging/patch/DebuggingPatch.kt
index dde5a8879..e7c1d9341 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/debugging/patch/DebuggingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/debugging/patch/DebuggingPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.misc.debugging.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.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
@@ -18,9 +15,8 @@ import app.revanced.util.enum.CategoryType
 @Description("Adds debugging options.")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class DebuggingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         SettingsPatch.addMusicPreference(
             CategoryType.MISC,
@@ -28,6 +24,5 @@ class DebuggingPatch : ResourcePatch {
             "false"
         )
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/patch/ExclusiveAudioPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/patch/ExclusiveAudioPatch.kt
index 1d134bb41..369f9dc64 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/patch/ExclusiveAudioPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/patch/ExclusiveAudioPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.music.misc.exclusiveaudio.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.misc.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
@@ -21,17 +18,15 @@ import app.revanced.patches.music.utils.fix.decoding.patch.DecodingPatch
 @Description("Enables the option to play music without video.")
 @DependsOn([DecodingPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class ExclusiveAudioPatch : BytecodePatch(
     listOf(AudioOnlyEnablerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         AudioOnlyEnablerFingerprint.result?.mutableMethod?.let {
             it.replaceInstruction(it.implementation!!.instructions.count() - 1, "const/4 v0, 0x1")
             it.addInstruction("return v0")
-        } ?: return AudioOnlyEnablerFingerprint.toErrorResult()
+        } ?: throw AudioOnlyEnablerFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt
index e4545b823..8b96667b8 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.music.misc.minimizedplayback.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.misc.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
 import app.revanced.patches.music.utils.annotations.MusicCompatibility
@@ -17,16 +14,14 @@ import app.revanced.patches.music.utils.annotations.MusicCompatibility
 @Name("Enable minimized playback")
 @Description("Enables minimized playback on Kids music.")
 @MusicCompatibility
-@Version("0.0.1")
 class MinimizedPlaybackPatch : BytecodePatch(
     listOf(MinimizedPlaybackManagerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         MinimizedPlaybackManagerFingerprint.result?.mutableMethod?.addInstruction(
             0, "return-void"
-        ) ?: return MinimizedPlaybackManagerFingerprint.toErrorResult()
+        ) ?: throw MinimizedPlaybackManagerFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/optimizeresource/patch/OptimizeResourcePatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/optimizeresource/patch/OptimizeResourcePatch.kt
index 26092e5c6..bffc6efb9 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/optimizeresource/patch/OptimizeResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/optimizeresource/patch/OptimizeResourcePatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.misc.optimizeresource.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.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
@@ -19,9 +16,8 @@ import java.nio.file.StandardCopyOption
 @Description("Remove unnecessary resources.")
 @DependsOn([DecodingPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class OptimizeResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         val relativePath = "raw/third_party_licenses"
 
@@ -31,6 +27,5 @@ class OptimizeResourcePatch : ResourcePatch {
             StandardCopyOption.REPLACE_EXISTING
         )
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/premium/patch/HideGetPremiumPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/premium/patch/HideGetPremiumPatch.kt
index c718567e4..2ffa60eeb 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/premium/patch/HideGetPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/premium/patch/HideGetPremiumPatch.kt
@@ -1,16 +1,12 @@
 package app.revanced.patches.music.misc.premium.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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
@@ -37,14 +33,13 @@ import com.android.tools.smali.dexlib2.iface.reference.Reference
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class HideGetPremiumPatch : BytecodePatch(
     listOf(
         AccountMenuFooterFingerprint,
         HideGetPremiumFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         HideGetPremiumFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -56,7 +51,7 @@ class HideGetPremiumPatch : BytecodePatch(
                     "const/4 v$register, 0x0"
                 )
             }
-        } ?: return HideGetPremiumFingerprint.toErrorResult()
+        } ?: throw HideGetPremiumFingerprint.exception
 
 
         AccountMenuFooterFingerprint.result?.let {
@@ -89,9 +84,8 @@ class HideGetPremiumPatch : BytecodePatch(
                     }
                 }
             }
-        } ?: return AccountMenuFooterFingerprint.toErrorResult()
+        } ?: throw AccountMenuFooterFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/quality/patch/VideoQualityPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/quality/patch/VideoQualityPatch.kt
index 88b168a15..e6ddac4ec 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/quality/patch/VideoQualityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/quality/patch/VideoQualityPatch.kt
@@ -1,18 +1,15 @@
 package app.revanced.patches.music.misc.quality.patch
 
+import app.revanced.extensions.exception
 import app.revanced.extensions.findMutableMethodOf
-import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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.music.misc.quality.fingerprints.MusicVideoQualitySettingsFingerprint
@@ -42,14 +39,13 @@ import com.android.tools.smali.dexlib2.iface.reference.Reference
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class VideoQualityPatch : BytecodePatch(
     listOf(
         MusicVideoQualitySettingsParentFingerprint,
         UserQualityChangeFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         UserQualityChangeFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -82,7 +78,7 @@ class VideoQualityPatch : BytecodePatch(
                     }
                 }
             }
-        } ?: return UserQualityChangeFingerprint.toErrorResult()
+        } ?: throw UserQualityChangeFingerprint.exception
 
         MusicVideoQualitySettingsParentFingerprint.result?.let { parentResult ->
             MusicVideoQualitySettingsFingerprint.also {
@@ -98,8 +94,8 @@ class VideoQualityPatch : BytecodePatch(
                     invoke-static {p1, p2, v0}, $INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR->setVideoQuality([Ljava/lang/Object;ILjava/lang/Object;)I
                     move-result p2
                     """
-            ) ?: return MusicVideoQualitySettingsFingerprint.toErrorResult()
-        } ?: return MusicVideoQualitySettingsParentFingerprint.toErrorResult()
+            ) ?: throw MusicVideoQualitySettingsFingerprint.exception
+        } ?: throw MusicVideoQualitySettingsParentFingerprint.exception
 
         VideoIdPatch.injectCall("$INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;)V")
         SettingsPatch.addMusicPreference(
@@ -108,7 +104,6 @@ class VideoQualityPatch : BytecodePatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/sharebuttonhook/patch/ShareButtonHookPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/sharebuttonhook/patch/ShareButtonHookPatch.kt
index 28a7cc83d..a119fcc7d 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/sharebuttonhook/patch/ShareButtonHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/sharebuttonhook/patch/ShareButtonHookPatch.kt
@@ -1,17 +1,14 @@
 package app.revanced.patches.music.misc.sharebuttonhook.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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
@@ -36,7 +33,6 @@ import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class ShareButtonHookPatch : BytecodePatch(
     listOf(
         ConnectionTrackerFingerprint,
@@ -45,7 +41,7 @@ class ShareButtonHookPatch : BytecodePatch(
         ShowToastFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SharePanelFingerprint.result?.let {
             it.mutableMethod.apply {
                 val targetIndex = it.scanResult.patternScanResult!!.startIndex
@@ -60,26 +56,26 @@ class ShareButtonHookPatch : BytecodePatch(
                         """, ExternalLabel("default", getInstruction(targetIndex))
                 )
             }
-        } ?: return SharePanelFingerprint.toErrorResult()
+        } ?: throw SharePanelFingerprint.exception
 
         ConnectionTrackerFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "sput-object p1, $INTEGRATIONS_CLASS_DESCRIPTOR->context:Landroid/content/Context;"
-        ) ?: return ConnectionTrackerFingerprint.toErrorResult()
+        ) ?: throw ConnectionTrackerFingerprint.exception
 
         ShowToastFingerprint.result?.mutableMethod?.addInstructions(
             0, """
                 invoke-static {p0}, $INTEGRATIONS_CLASS_DESCRIPTOR->dismissContext(Landroid/content/Context;)Landroid/content/Context;
                 move-result-object p0
                 """
-        ) ?: return ShowToastFingerprint.toErrorResult()
+        ) ?: throw ShowToastFingerprint.exception
 
         FullStackTraceActivityFingerprint.result?.mutableMethod?.addInstructions(
             1, """
                 invoke-static {p0}, $MUSIC_INTEGRATIONS_PATH/settingsmenu/SharedPreferenceChangeListener;->initializeSettings(Landroid/app/Activity;)V
                 return-void
                 """
-        ) ?: return FullStackTraceActivityFingerprint.toErrorResult()
+        ) ?: throw FullStackTraceActivityFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.MISC,
@@ -92,7 +88,6 @@ class ShareButtonHookPatch : BytecodePatch(
             "revanced_hook_share_button"
         )
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/patch/EnforceShufflePatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/shuffle/patch/EnforceShufflePatch.kt
index e82fc1cd1..72b4a532f 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/patch/EnforceShufflePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/shuffle/patch/EnforceShufflePatch.kt
@@ -1,21 +1,18 @@
 package app.revanced.patches.music.misc.shuffle.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.extensions.transformFields
+import app.revanced.extensions.traverseClassHierarchy
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.getInstruction
 import app.revanced.patcher.extensions.or
 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.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patcher.util.smali.toInstructions
@@ -47,7 +44,6 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class EnforceShufflePatch : BytecodePatch(
     listOf(
         MusicPlaybackControlsFingerprint,
@@ -55,7 +51,7 @@ class EnforceShufflePatch : BytecodePatch(
         ShuffleClassReferenceFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         ShuffleClassReferenceFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -72,7 +68,7 @@ class EnforceShufflePatch : BytecodePatch(
                 shuffleReference3 = getInstruction(endIndex).descriptor
                 shuffleReference4 = getInstruction(imageViewIndex).descriptor
             }
-        } ?: return ShuffleClassReferenceFingerprint.toErrorResult()
+        } ?: throw ShuffleClassReferenceFingerprint.exception
 
 
         ShuffleClassFingerprint.result?.let {
@@ -97,7 +93,7 @@ class EnforceShufflePatch : BytecodePatch(
                     ).toMutable()
                 }
             }
-        } ?: return ShuffleClassFingerprint.toErrorResult()
+        } ?: throw ShuffleClassFingerprint.exception
 
         MusicPlaybackControlsFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -163,7 +159,7 @@ class EnforceShufflePatch : BytecodePatch(
                     ).toMutable()
                 )
             }
-        } ?: return MusicPlaybackControlsFingerprint.toErrorResult()
+        } ?: throw MusicPlaybackControlsFingerprint.exception
 
         SettingsPatch.addMusicPreference(
             CategoryType.MISC,
@@ -171,7 +167,6 @@ class EnforceShufflePatch : BytecodePatch(
             "true"
         )
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/TasteBuilderPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/TasteBuilderPatch.kt
index 53caa77d0..09e958631 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/TasteBuilderPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/TasteBuilderPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.music.misc.tastebuilder.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.misc.tastebuilder.fingerprints.TasteBuilderConstructorFingerprint
@@ -22,11 +19,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 @Description("Hides the \"Tell us which artists you like\" card from homepage.")
 @DependsOn([DecodingPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class TasteBuilderPatch : BytecodePatch(
     listOf(TasteBuilderConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         TasteBuilderConstructorFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = it.scanResult.patternScanResult!!.endIndex - 8
@@ -39,8 +35,7 @@ class TasteBuilderPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return TasteBuilderConstructorFingerprint.toErrorResult()
+        } ?: throw TasteBuilderConstructorFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/translations/patch/TranslationsPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/translations/patch/TranslationsPatch.kt
index 4ffdfae0e..9b59082fe 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/translations/patch/TranslationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/translations/patch/TranslationsPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.misc.translations.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.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
@@ -18,13 +15,11 @@ import app.revanced.util.resources.ResourceHelper.addTranslations
 @Description("Add Crowdin translations for YouTube Music.")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class TranslationsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         context.addTranslations("music", LANGUAGE_LIST)
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/UpgradeButtonPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/UpgradeButtonPatch.kt
index 5faee268a..7799658d5 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/UpgradeButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/UpgradeButtonPatch.kt
@@ -1,17 +1,14 @@
 package app.revanced.patches.music.misc.upgradebutton.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.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.patcher.patch.annotations.Patch
 import app.revanced.patches.music.misc.upgradebutton.fingerprints.NotifierShelfFingerprint
@@ -35,14 +32,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class UpgradeButtonPatch : BytecodePatch(
     listOf(
         PivotBarConstructorFingerprint,
         NotifierShelfFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         PivotBarConstructorFingerprint.result?.let {
             it.mutableMethod.apply {
                 val targetIndex = it.scanResult.patternScanResult!!.startIndex
@@ -67,7 +63,7 @@ class UpgradeButtonPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return PivotBarConstructorFingerprint.toErrorResult()
+        } ?: throw PivotBarConstructorFingerprint.exception
 
         NotifierShelfFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -78,8 +74,7 @@ class UpgradeButtonPatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, Lapp/revanced/music/utils/ReVancedUtils;->hideViewByLayoutParams(Landroid/view/View;)V"
                 )
             }
-        } ?: return NotifierShelfFingerprint.toErrorResult()
+        } ?: throw NotifierShelfFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/misc/versionspoof/patch/SpoofAppVersionPatch.kt b/src/main/kotlin/app/revanced/patches/music/misc/versionspoof/patch/SpoofAppVersionPatch.kt
index 507d998bf..58c3913f0 100644
--- a/src/main/kotlin/app/revanced/patches/music/misc/versionspoof/patch/SpoofAppVersionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/versionspoof/patch/SpoofAppVersionPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.misc.versionspoof.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-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.music.utils.annotations.MusicCompatibility
@@ -19,11 +16,10 @@ import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
 @Description("Spoof the YouTube Music client version.")
 @DependsOn([SettingsPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class SpoofAppVersionPatch : AbstractVersionSpoofPatch(
     "$MUSIC_MISC_PATH/SpoofAppVersionPatch;->getVersionOverride(Ljava/lang/String;)Ljava/lang/String;"
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         super.execute(context)
 
         SettingsPatch.addMusicPreference(
@@ -32,6 +28,5 @@ class SpoofAppVersionPatch : AbstractVersionSpoofPatch(
             "false"
         )
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/fix/androidauto/patch/AndroidAutoCertificatePatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/fix/androidauto/patch/AndroidAutoCertificatePatch.kt
index 1ae8669f8..e638e5866 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/fix/androidauto/patch/AndroidAutoCertificatePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/fix/androidauto/patch/AndroidAutoCertificatePatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.music.utils.fix.androidauto.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.music.utils.annotations.MusicCompatibility
@@ -20,19 +17,17 @@ import app.revanced.patches.music.utils.fix.decoding.patch.DecodingPatch
 @Description("Spoofs the YouTube Music certificate for Android Auto.")
 @DependsOn([DecodingPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class AndroidAutoCertificatePatch : BytecodePatch(
     listOf(CertificateCheckFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         CertificateCheckFingerprint.result?.mutableMethod?.addInstructions(
             0, """
                 const/4 v0, 0x1
                 return v0
                 """
-        ) ?: return CertificateCheckFingerprint.toErrorResult()
+        ) ?: throw CertificateCheckFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/fix/clientspoof/patch/ClientSpoofMusicPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/fix/clientspoof/patch/ClientSpoofMusicPatch.kt
index e46e6f56b..20e9f802a 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/fix/clientspoof/patch/ClientSpoofMusicPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/fix/clientspoof/patch/ClientSpoofMusicPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.music.utils.fix.clientspoof.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.music.utils.fix.clientspoof.fingerprints.UserAgentHeaderBuilderFingerprint
 import app.revanced.patches.music.utils.microg.shared.Constants.MUSIC_PACKAGE_NAME
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@@ -14,7 +12,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 class ClientSpoofMusicPatch : BytecodePatch(
     listOf(UserAgentHeaderBuilderFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         UserAgentHeaderBuilderFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -27,8 +25,7 @@ class ClientSpoofMusicPatch : BytecodePatch(
                     "const-string v$packageNameRegister, \"$MUSIC_PACKAGE_NAME\""
                 )
             }
-        } ?: return UserAgentHeaderBuilderFingerprint.toErrorResult()
+        } ?: throw UserAgentHeaderBuilderFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/fix/decoding/patch/DecodingPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/fix/decoding/patch/DecodingPatch.kt
index 47ff8771f..c0aeec9e5 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/fix/decoding/patch/DecodingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/fix/decoding/patch/DecodingPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.music.utils.fix.decoding.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
 
 class DecodingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         /**
          * For some reason, Androlib is incorrectly decoding some resources of YT Music
@@ -29,6 +27,5 @@ class DecodingPatch : ResourcePatch {
             }
         }
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/litho/patch/LithoFilterPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/litho/patch/LithoFilterPatch.kt
index 0ca3260ea..55753b9bc 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/litho/patch/LithoFilterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/litho/patch/LithoFilterPatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.music.utils.litho.patch
 
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Version
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 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.music.utils.annotations.MusicCompatibility
 import app.revanced.patches.music.utils.litho.fingerprints.LithoFilterFingerprint
@@ -19,11 +16,10 @@ import java.io.Closeable
 
 @DependsOn([ComponentParserPatch::class])
 @MusicCompatibility
-@Version("0.0.1")
 class LithoFilterPatch : BytecodePatch(
     listOf(LithoFilterFingerprint)
 ), Closeable {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         identifierHook("$MUSIC_ADS_PATH/LithoFilterPatch;->filter")
 
         LithoFilterFingerprint.result?.mutableMethod?.apply {
@@ -40,9 +36,8 @@ class LithoFilterPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return LithoFilterFingerprint.toErrorResult()
+        } ?: throw LithoFilterFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     override fun close() = LithoFilterFingerprint.result!!
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/microg/bytecode/patch/MicroGPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/microg/bytecode/patch/MicroGPatch.kt
index 5919339b1..369659e4e 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/microg/bytecode/patch/MicroGPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/microg/bytecode/patch/MicroGPatch.kt
@@ -2,12 +2,9 @@ package app.revanced.patches.music.utils.microg.bytecode.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.music.utils.annotations.MusicCompatibility
@@ -37,7 +34,6 @@ import app.revanced.util.microg.MicroGBytecodeHelper
 @Name("MicroG support")
 @Description("Allows ReVanced Music to run without root and under a different package name with MicroG.")
 @MusicCompatibility
-@Version("0.0.2")
 class MicroGPatch : BytecodePatch(
     listOf(
         ServiceCheckFingerprint,
@@ -55,15 +51,15 @@ class MicroGPatch : BytecodePatch(
     // - "com.google.android.gms.phenotype.PACKAGE_NAME",
     // - "com.google.android.gms.phenotype.UPDATE",
     // - "com.google.android.gms.phenotype",
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val youtubePackageName = PackageNamePatch.YouTubePackageName
-            ?: throw PatchResultError("Invalid package name.")
+            ?: throw PatchException("Invalid package name.")
 
         val musicPackageName = PackageNamePatch.MusicPackageName
-            ?: throw PatchResultError("Invalid package name.")
+            ?: throw PatchException("Invalid package name.")
 
         if (youtubePackageName == YOUTUBE_PACKAGE_NAME || musicPackageName == MUSIC_PACKAGE_NAME)
-            throw PatchResultError("Original package name is not available as package name for MicroG build.")
+            throw PatchException("Original package name is not available as package name for MicroG build.")
 
         // apply common microG patch
         MicroGBytecodeHelper.patchBytecode(
@@ -88,6 +84,5 @@ class MicroGPatch : BytecodePatch(
             )
         )
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/microg/resource/patch/MicroGResourcePatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/microg/resource/patch/MicroGResourcePatch.kt
index 49e02c152..2c690bccc 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/microg/resource/patch/MicroGResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/microg/resource/patch/MicroGResourcePatch.kt
@@ -1,9 +1,7 @@
 package app.revanced.patches.music.utils.microg.resource.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.music.utils.microg.shared.Constants.MUSIC_PACKAGE_NAME
@@ -16,12 +14,12 @@ import app.revanced.util.resources.MusicResourceHelper.setMicroG
 
 @DependsOn([PackageNamePatch::class])
 class MicroGResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         val packageName = PackageNamePatch.MusicPackageName
-            ?: throw PatchResultError("Invalid package name.")
+            ?: throw PatchException("Invalid package name.")
 
         if (packageName == MUSIC_PACKAGE_NAME)
-            throw PatchResultError("Original package name is not available as package name for MicroG build.")
+            throw PatchException("Original package name is not available as package name for MicroG build.")
 
         // update manifest
         context.patchManifest(
@@ -37,6 +35,5 @@ class MicroGResourcePatch : ResourcePatch {
 
         context.setMicroG(packageName)
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/resourceid/patch/SharedResourceIdPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/resourceid/patch/SharedResourceIdPatch.kt
index d7767b26c..e9490bdc5 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/resourceid/patch/SharedResourceIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/resourceid/patch/SharedResourceIdPatch.kt
@@ -1,9 +1,7 @@
 package app.revanced.patches.music.utils.resourceid.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.patch.mapping.ResourceMappingPatch
@@ -30,12 +28,12 @@ class SharedResourceIdPatch : ResourcePatch {
         var Text1: Long = -1
     }
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         fun find(resourceType: ResourceType, resourceName: String) = ResourceMappingPatch
             .resourceMappings
             .find { it.type == resourceType.value && it.name == resourceName }?.id
-            ?: throw PatchResultError("Failed to find resource id : $resourceName")
+            ?: throw PatchException("Failed to find resource id : $resourceName")
 
         ChipCloud = find(LAYOUT, "chip_cloud")
         ColorGrey = find(COLOR, "ytm_color_grey_12")
@@ -47,6 +45,5 @@ class SharedResourceIdPatch : ResourcePatch {
         QualityTitle = find(STRING, "quality_title")
         Text1 = find(ID, "text1")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/settings/bytecode/patch/SettingsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/settings/bytecode/patch/SettingsBytecodePatch.kt
index 933255d93..3841201bd 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/settings/bytecode/patch/SettingsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/settings/bytecode/patch/SettingsBytecodePatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.music.utils.settings.bytecode.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.music.utils.integrations.patch.IntegrationsPatch
 import app.revanced.patches.music.utils.settings.bytecode.fingerprints.PreferenceFingerprint
@@ -22,7 +20,7 @@ class SettingsBytecodePatch : BytecodePatch(
         SettingsHeadersFragmentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SettingsHeadersFragmentFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -34,7 +32,7 @@ class SettingsBytecodePatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->setActivity(Ljava/lang/Object;)V"
                 )
             }
-        } ?: return SettingsHeadersFragmentFingerprint.toErrorResult()
+        } ?: throw SettingsHeadersFragmentFingerprint.exception
 
         PreferenceFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -47,9 +45,8 @@ class SettingsBytecodePatch : BytecodePatch(
                     "invoke-static {v$keyRegister, v$valueRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onPreferenceChanged(Ljava/lang/String;Z)V"
                 )
             }
-        } ?: return PreferenceFingerprint.toErrorResult()
+        } ?: throw PreferenceFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/settings/resource/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/settings/resource/patch/SettingsPatch.kt
index d5a280516..5835e8592 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/settings/resource/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/settings/resource/patch/SettingsPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.music.utils.settings.resource.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.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.music.utils.annotations.MusicCompatibility
@@ -37,13 +34,12 @@ import java.nio.file.Paths
     ]
 )
 @MusicCompatibility
-@Version("0.0.1")
 class SettingsPatch : AbstractSettingsResourcePatch(
     "music/settings",
     "music/settings/host",
     false
 ) {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         super.execute(context)
         contexts = context
 
@@ -110,7 +106,6 @@ class SettingsPatch : AbstractSettingsResourcePatch(
                 .let(::copyResources)
         }
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/music/utils/videoid/patch/VideoIdPatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/videoid/patch/VideoIdPatch.kt
index 312c89399..c46aa4446 100644
--- a/src/main/kotlin/app/revanced/patches/music/utils/videoid/patch/VideoIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/videoid/patch/VideoIdPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.music.utils.videoid.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.music.utils.videoid.fingerprint.VideoIdParentFingerprint
 import app.revanced.util.integrations.Constants.MUSIC_UTILS_PATH
@@ -18,7 +16,7 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 class VideoIdPatch : BytecodePatch(
     listOf(VideoIdParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         VideoIdParentFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -33,7 +31,7 @@ class VideoIdPatch : BytecodePatch(
                         method.name == "handleVideoStageEvent"
                     }
             }
-        } ?: return VideoIdParentFingerprint.toErrorResult()
+        } ?: throw VideoIdParentFingerprint.exception
 
         insertMethod.apply {
             for (index in implementation!!.instructions.size - 1 downTo 0) {
@@ -53,7 +51,6 @@ class VideoIdPatch : BytecodePatch(
 
         injectCall("$INTEGRATIONS_CLASS_DESCRIPTOR->setVideoId(Ljava/lang/String;)V")
 
-        return PatchResultSuccess()
     }
 
     companion object {
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 ff42df572..2e2770e89 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
@@ -1,12 +1,10 @@
 package app.revanced.patches.reddit.ad.banner.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
 
 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")
@@ -28,7 +26,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 e39012d39..2f7f8fc1a 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
@@ -1,13 +1,10 @@
 package app.revanced.patches.reddit.ad.comments.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 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.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.reddit.ad.comments.fingerprints.HideCommentAdsFingerprint
@@ -15,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) {
         HideCommentAdsFingerprint.result?.let {
             with(
                 context
@@ -34,9 +31,8 @@ class HideCommentAdsPatch : BytecodePatch(
                         """, ExternalLabel("show", getInstruction(0))
                 )
             }
-        } ?: return HideCommentAdsFingerprint.toErrorResult()
+        } ?: throw HideCommentAdsFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     private companion object {
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 e173c49b7..abb13ba29 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
@@ -1,17 +1,14 @@
 package app.revanced.patches.reddit.ad.general.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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.patch.annotations.RequiresIntegrations
@@ -40,14 +37,13 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 )
 @RedditCompatibility
 @RequiresIntegrations
-@Version("0.0.2")
 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?.let {
@@ -57,7 +53,7 @@ class HideAdsPatch : BytecodePatch(
                 val targetReferenceName = (targetReference as FieldReference).name
 
                 if (targetReferenceName != "children")
-                    throw PatchResultError("Method signature reference name did not match: $targetReferenceName")
+                    throw PatchException("Method signature reference name did not match: $targetReferenceName")
 
                 val targetRegister = getInstruction<Instruction22c>(targetIndex).registerA
 
@@ -68,7 +64,7 @@ class HideAdsPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return AdPostFingerprint.toErrorResult()
+        } ?: throw AdPostFingerprint.exception
 
         // The new feeds work by inserting posts into lists.
         // AdElementConverter is conveniently responsible for inserting all feed ads.
@@ -80,7 +76,7 @@ class HideAdsPatch : BytecodePatch(
                     getInstruction<ReferenceInstruction>(targetIndex).reference.toString()
 
                 if (!targetParameter.endsWith("Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z"))
-                    throw PatchResultError("Method signature parameter did not match: $targetParameter")
+                    throw PatchException("Method signature parameter did not match: $targetParameter")
 
                 val targetRegister =
                     getInstruction<FiveRegisterInstruction>(targetIndex).registerD + 1
@@ -93,11 +89,10 @@ class HideAdsPatch : BytecodePatch(
                         """, ExternalLabel("show", getInstruction(targetIndex + 1))
                 )
             }
-        } ?: return NewAdPostFingerprint.toErrorResult()
+        } ?: throw NewAdPostFingerprint.exception
 
         updateSettingsStatus("GeneralAds")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/reddit/layout/navigation/patch/NavigationButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/layout/navigation/patch/NavigationButtonsPatch.kt
index 736f75970..e96f1ad46 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/navigation/patch/NavigationButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/navigation/patch/NavigationButtonsPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.reddit.layout.navigation.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.reddit.layout.navigation.fingerprints.BottomNavScreenFingerprint
@@ -23,11 +20,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 @Description("Hide buttons at navigation bar.")
 @DependsOn([SettingsPatch::class])
 @RedditCompatibility
-@Version("0.0.1")
 class NavigationButtonsPatch : BytecodePatch(
     listOf(BottomNavScreenFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         BottomNavScreenFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -40,11 +36,10 @@ class NavigationButtonsPatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $INTEGRATIONS_METHOD_DESCRIPTOR"
                 )
             }
-        } ?: return BottomNavScreenFingerprint.toErrorResult()
+        } ?: throw BottomNavScreenFingerprint.exception
 
         updateSettingsStatus("NavigationButtons")
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/reddit/layout/place/patch/PlaceButtonPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/layout/place/patch/PlaceButtonPatch.kt
index d46783d63..33dac6ee3 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/place/patch/PlaceButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/place/patch/PlaceButtonPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.reddit.layout.place.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.reddit.layout.place.fingerprints.HomePagerScreenFingerprint
@@ -24,11 +21,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Hide r/place button in toolbar.")
 @DependsOn([SettingsPatch::class])
 @RedditCompatibility
-@Version("0.0.1")
 class PlaceButtonPatch : BytecodePatch(
     listOf(HomePagerScreenFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         HomePagerScreenFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -42,11 +38,10 @@ class PlaceButtonPatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $INTEGRATIONS_METHOD_DESCRIPTOR"
                 )
             }
-        } ?: return HomePagerScreenFingerprint.toErrorResult()
+        } ?: throw HomePagerScreenFingerprint.exception
 
         updateSettingsStatus("PlaceButton")
 
-        return PatchResultSuccess()
     }
 
     companion object {
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 cbbdb8711..db45347fd 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
@@ -1,14 +1,11 @@
 package app.revanced.patches.reddit.layout.premiumicon.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.fingerprints.PremiumIconFingerprint
 import app.revanced.patches.reddit.utils.annotations.RedditCompatibility
@@ -17,11 +14,10 @@ import app.revanced.patches.reddit.utils.annotations.RedditCompatibility
 @Name("Premium icon")
 @Description("Unlocks premium icons.")
 @RedditCompatibility
-@Version("0.0.1")
 class PremiumIconPatch : BytecodePatch(
     listOf(PremiumIconFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         PremiumIconFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -32,8 +28,7 @@ class PremiumIconPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return PremiumIconFingerprint.toErrorResult()
+        } ?: throw PremiumIconFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/reddit/layout/screenshotpopup/patch/ScreenshotPopupPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/layout/screenshotpopup/patch/ScreenshotPopupPatch.kt
index 7006b2372..b1a01deab 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/screenshotpopup/patch/ScreenshotPopupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/screenshotpopup/patch/ScreenshotPopupPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.reddit.layout.screenshotpopup.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -29,11 +26,10 @@ import app.revanced.patches.reddit.utils.settings.resource.patch.SettingsPatch
     ]
 )
 @RedditCompatibility
-@Version("0.0.1")
 class ScreenshotPopupPatch : BytecodePatch(
     listOf(ScreenshotTakenBannerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         ScreenshotTakenBannerFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -46,11 +42,10 @@ class ScreenshotPopupPatch : BytecodePatch(
                         """, ExternalLabel("dismiss", getInstruction(0))
                 )
             }
-        } ?: return ScreenshotTakenBannerFingerprint.toErrorResult()
+        } ?: throw ScreenshotTakenBannerFingerprint.exception
 
         updateSettingsStatus("ScreenshotPopup")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/reddit/misc/openlink/patch/OpenLinksDirectlyPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/misc/openlink/patch/OpenLinksDirectlyPatch.kt
index 9292bfc55..15a3590d0 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/misc/openlink/patch/OpenLinksDirectlyPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/misc/openlink/patch/OpenLinksDirectlyPatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.reddit.misc.openlink.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.misc.openlink.fingerprints.ScreenNavigatorFingerprint
@@ -21,11 +18,10 @@ import app.revanced.patches.reddit.utils.settings.resource.patch.SettingsPatch
 @Description("Skips over redirection URLs to external links.")
 @DependsOn([SettingsPatch::class])
 @RedditCompatibility
-@Version("0.0.1")
 class OpenLinksDirectlyPatch : BytecodePatch(
     listOf(ScreenNavigatorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ScreenNavigatorFingerprint.result?.let {
             it.mutableMethod.apply {
                 addInstructions(
@@ -35,11 +31,10 @@ class OpenLinksDirectlyPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return ScreenNavigatorFingerprint.toErrorResult()
+        } ?: throw ScreenNavigatorFingerprint.exception
 
         updateSettingsStatus("OpenLinksDirectly")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/reddit/misc/openlink/patch/OpenLinksExternallyPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/misc/openlink/patch/OpenLinksExternallyPatch.kt
index 4c5aebf71..0dee9d20d 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/misc/openlink/patch/OpenLinksExternallyPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/misc/openlink/patch/OpenLinksExternallyPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.reddit.misc.openlink.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -24,11 +21,10 @@ import app.revanced.util.bytecode.getStringIndex
 @Description("Open links outside of the app directly in your browser.")
 @DependsOn([SettingsPatch::class])
 @RedditCompatibility
-@Version("0.0.1")
 class OpenLinksExternallyPatch : BytecodePatch(
     listOf(ScreenNavigatorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ScreenNavigatorFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = getStringIndex("uri") + 2
@@ -42,11 +38,10 @@ class OpenLinksExternallyPatch : BytecodePatch(
                         """, ExternalLabel("dismiss", getInstruction(insertIndex))
                 )
             }
-        } ?: return ScreenNavigatorFingerprint.toErrorResult()
+        } ?: throw ScreenNavigatorFingerprint.exception
 
         updateSettingsStatus("OpenLinksExternally")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
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 fe68369dc..65518fa28 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
@@ -1,15 +1,12 @@
 package app.revanced.patches.reddit.misc.tracking.url.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -23,11 +20,10 @@ import app.revanced.patches.reddit.utils.settings.resource.patch.SettingsPatch
 @Description("Removes (tracking) query parameters from the URLs when sharing links.")
 @DependsOn([SettingsPatch::class])
 @RedditCompatibility
-@Version("0.0.1")
 class SanitizeUrlQueryPatch : BytecodePatch(
     listOf(ShareLinkFormatterFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShareLinkFormatterFingerprint.result?.let { result ->
             result.mutableMethod.apply {
 
@@ -41,11 +37,10 @@ class SanitizeUrlQueryPatch : BytecodePatch(
                         """, ExternalLabel("off", getInstruction(0))
                 )
             }
-        } ?: return ShareLinkFormatterFingerprint.toErrorResult()
+        } ?: throw ShareLinkFormatterFingerprint.exception
 
         updateSettingsStatus("SanitizeUrlQuery")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/reddit/utils/fix/decoding/patch/DecodingPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/utils/fix/decoding/patch/DecodingPatch.kt
index ef8b87e61..307134fa4 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/utils/fix/decoding/patch/DecodingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/utils/fix/decoding/patch/DecodingPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.reddit.utils.fix.decoding.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
 
 class DecodingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         arrayOf(
             "res/layout/notification_media_cancel_action.xml",
@@ -26,6 +24,5 @@ class DecodingPatch : ResourcePatch {
             }
         }
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/reddit/utils/resourceid/patch/SharedResourceIdPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/utils/resourceid/patch/SharedResourceIdPatch.kt
index 65328dcd7..1d9463aa5 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/utils/resourceid/patch/SharedResourceIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/utils/resourceid/patch/SharedResourceIdPatch.kt
@@ -1,9 +1,7 @@
 package app.revanced.patches.reddit.utils.resourceid.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.patch.mapping.ResourceMappingPatch
@@ -16,15 +14,14 @@ class SharedResourceIdPatch : ResourcePatch {
         var ScreenShotShareBanner: Long = -1
     }
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         fun find(resourceType: ResourceType, resourceName: String) = ResourceMappingPatch
             .resourceMappings
             .find { it.type == resourceType.value && it.name == resourceName }?.id
-            ?: throw PatchResultError("Failed to find resource id : $resourceName")
+            ?: throw PatchException("Failed to find resource id : $resourceName")
 
         ScreenShotShareBanner = find(STRING, "screenshot_share_banner_title")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/reddit/utils/settings/bytecode/patch/SettingsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/reddit/utils/settings/bytecode/patch/SettingsBytecodePatch.kt
index 00af53810..4123add5b 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/utils/settings/bytecode/patch/SettingsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/utils/settings/bytecode/patch/SettingsBytecodePatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.reddit.utils.settings.bytecode.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.getInstruction
 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.reddit.utils.settings.bytecode.fingerprints.AcknowledgementsLabelBuilderFingerprint
 import app.revanced.patches.reddit.utils.settings.bytecode.fingerprints.OssLicensesMenuActivityOnCreateFingerprint
@@ -22,7 +20,7 @@ class SettingsBytecodePatch : BytecodePatch(
         SettingsStatusLoadFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         /**
          * Replace settings label
@@ -39,7 +37,7 @@ class SettingsBytecodePatch : BytecodePatch(
                     "const-string v$insertRegister, \"ReVanced Extended\""
                 )
             }
-        } ?: return AcknowledgementsLabelBuilderFingerprint.toErrorResult()
+        } ?: throw AcknowledgementsLabelBuilderFingerprint.exception
 
         /**
          * Initialize settings activity
@@ -55,12 +53,11 @@ class SettingsBytecodePatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return OssLicensesMenuActivityOnCreateFingerprint.toErrorResult()
+        } ?: throw OssLicensesMenuActivityOnCreateFingerprint.exception
 
         settingsMethod = SettingsStatusLoadFingerprint.result?.mutableMethod
-            ?: return SettingsStatusLoadFingerprint.toErrorResult()
+            ?: throw SettingsStatusLoadFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/reddit/utils/settings/resource/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/reddit/utils/settings/resource/patch/SettingsPatch.kt
index 663f4d7d3..7b7ada013 100644
--- a/src/main/kotlin/app/revanced/patches/reddit/utils/settings/resource/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/utils/settings/resource/patch/SettingsPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.reddit.utils.settings.resource.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.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.patcher.patch.annotations.Patch
@@ -27,9 +24,8 @@ import kotlin.io.path.exists
     ]
 )
 @RedditCompatibility
-@Version("0.0.1")
 class SettingsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         /**
          * Replace settings icon and label
@@ -39,7 +35,7 @@ class SettingsPatch : ResourcePatch {
             val targetXml = resDirectory.resolve("xml").resolve("$targetXML.xml").toPath()
 
             if (!targetXml.exists())
-                return PatchResultError("The preferences can not be found.")
+                throw PatchException("The preferences can not be found.")
 
             val preference = context["res/xml/$targetXML.xml"]
 
@@ -52,6 +48,5 @@ class SettingsPatch : ResourcePatch {
             )
         }
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/shared/patch/ads/AbstractAdsPatch.kt b/src/main/kotlin/app/revanced/patches/shared/patch/ads/AbstractAdsPatch.kt
index 77bd35433..294972fbc 100644
--- a/src/main/kotlin/app/revanced/patches/shared/patch/ads/AbstractAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/ads/AbstractAdsPatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.shared.patch.ads
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.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.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.fingerprints.ads.LegacyAdsFingerprint
@@ -22,7 +19,7 @@ abstract class AbstractAdsPatch(
         MainstreamAdsFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LegacyAdsFingerprint.result?.let {
             (context.toMethodWalker(it.method)
                 .nextMethod(13, true)
@@ -34,7 +31,7 @@ abstract class AbstractAdsPatch(
                         """
                 )
             }
-        } ?: return LegacyAdsFingerprint.toErrorResult()
+        } ?: throw LegacyAdsFingerprint.exception
 
         MainstreamAdsFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -49,6 +46,5 @@ abstract class AbstractAdsPatch(
             }
         }
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/shared/patch/integrations/AbstractIntegrationsPatch.kt b/src/main/kotlin/app/revanced/patches/shared/patch/integrations/AbstractIntegrationsPatch.kt
index 4ad028617..538aba85f 100644
--- a/src/main/kotlin/app/revanced/patches/shared/patch/integrations/AbstractIntegrationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/integrations/AbstractIntegrationsPatch.kt
@@ -1,22 +1,17 @@
 package app.revanced.patches.shared.patch.integrations
 
-import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Version
 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.patch.integrations.AbstractIntegrationsPatch.IntegrationsFingerprint.RegisterResolver
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.iface.Method
 
 @Description("Applies mandatory patches to implement the ReVanced integrations into the application.")
-@Version("0.0.1")
 abstract class AbstractIntegrationsPatch(
     private val integrationsDescriptor: String,
     private val hooks: Iterable<IntegrationsFingerprint>
@@ -43,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)
 
@@ -52,9 +47,7 @@ abstract class AbstractIntegrationsPatch(
                     "sput-object v$contextRegister, " +
                             "$integrationsDescriptor->context:Landroid/content/Context;"
                 )
-            } ?: return toErrorResult()
-
-            return PatchResultSuccess()
+            } ?: throw PatchException("Could not find target fingerprint.")
         }
 
         interface RegisterResolver : (Method) -> Int {
@@ -62,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/patch/litho/ComponentParserPatch.kt b/src/main/kotlin/app/revanced/patches/shared/patch/litho/ComponentParserPatch.kt
index bbb8d8833..087e4399d 100644
--- a/src/main/kotlin/app/revanced/patches/shared/patch/litho/ComponentParserPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/litho/ComponentParserPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.shared.patch.litho
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.fingerprints.litho.EmptyComponentBuilderFingerprint
@@ -27,7 +25,7 @@ class ComponentParserPatch : BytecodePatch(
         IdentifierFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         EmptyComponentBuilderFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -52,9 +50,9 @@ class ComponentParserPatch : BytecodePatch(
                 }
 
                 if (emptyComponentLabel.isEmpty())
-                    throw PatchResultError("could not find Empty Component Label in method")
+                    throw PatchException("could not find Empty Component Label in method")
             }
-        } ?: return EmptyComponentBuilderFingerprint.toErrorResult()
+        } ?: throw EmptyComponentBuilderFingerprint.exception
 
         IdentifierFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -89,9 +87,8 @@ class ComponentParserPatch : BytecodePatch(
 
                 insertIndex = stringBuilderIndex + 1
             }
-        } ?: return IdentifierFingerprint.toErrorResult()
+        } ?: throw IdentifierFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/shared/patch/mapping/ResourceMappingPatch.kt b/src/main/kotlin/app/revanced/patches/shared/patch/mapping/ResourceMappingPatch.kt
index 86869befe..81d0980ab 100644
--- a/src/main/kotlin/app/revanced/patches/shared/patch/mapping/ResourceMappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/mapping/ResourceMappingPatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.shared.patch.mapping
 
 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.Collections
@@ -18,7 +16,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,7 +57,6 @@ class ResourceMappingPatch : ResourcePatch {
 
         resourceMappings = mappings
 
-        return PatchResultSuccess()
     }
 }
 
diff --git a/src/main/kotlin/app/revanced/patches/shared/patch/opus/AbstractOpusCodecsPatch.kt b/src/main/kotlin/app/revanced/patches/shared/patch/opus/AbstractOpusCodecsPatch.kt
index adebc561c..55e7d3d12 100644
--- a/src/main/kotlin/app/revanced/patches/shared/patch/opus/AbstractOpusCodecsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/opus/AbstractOpusCodecsPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.shared.patch.opus
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.fingerprints.opus.CodecReferenceFingerprint
 import app.revanced.patches.shared.fingerprints.opus.CodecSelectorFingerprint
@@ -24,7 +22,7 @@ abstract class AbstractOpusCodecsPatch(
         CodecSelectorFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         CodecReferenceFingerprint.result?.mutableMethod?.let {
             it.implementation!!.instructions.apply {
@@ -41,9 +39,9 @@ abstract class AbstractOpusCodecsPatch(
                     }
                 }
                 if (targetIndex == 0)
-                    throw PatchResultError("Target method not found!")
+                    throw PatchException("Target method not found!")
             }
-        } ?: return CodecReferenceFingerprint.toErrorResult()
+        } ?: throw CodecReferenceFingerprint.exception
 
         CodecSelectorFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -60,9 +58,8 @@ abstract class AbstractOpusCodecsPatch(
                         """, ExternalLabel("mp4a", getInstruction(targetIndex + 1))
                 )
             }
-        } ?: return CodecSelectorFingerprint.toErrorResult()
+        } ?: throw CodecSelectorFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/shared/patch/packagename/PackageNamePatch.kt b/src/main/kotlin/app/revanced/patches/shared/patch/packagename/PackageNamePatch.kt
index f782b08d7..cede05537 100644
--- a/src/main/kotlin/app/revanced/patches/shared/patch/packagename/PackageNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/packagename/PackageNamePatch.kt
@@ -2,12 +2,9 @@ package app.revanced.patches.shared.patch.packagename
 
 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.OptionsContainer
 import app.revanced.patcher.patch.PatchOption
-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.shared.annotation.RVXCompatibility
@@ -16,10 +13,8 @@ import app.revanced.patches.shared.annotation.RVXCompatibility
 @Name("Custom package name")
 @Description("Specifies the package name for YouTube and YT Music in the MicroG build.")
 @RVXCompatibility
-@Version("0.0.1")
 class PackageNamePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
-        return PatchResultSuccess()
+    override fun execute(context: ResourceContext) {
     }
 
     companion object : OptionsContainer() {
diff --git a/src/main/kotlin/app/revanced/patches/shared/patch/settings/AbstractSettingsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/shared/patch/settings/AbstractSettingsResourcePatch.kt
index bca39fd2e..e1321d277 100644
--- a/src/main/kotlin/app/revanced/patches/shared/patch/settings/AbstractSettingsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/settings/AbstractSettingsResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.shared.patch.settings
 
 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.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
@@ -19,7 +17,7 @@ abstract class AbstractSettingsResourcePatch(
     private val sourceHostDirectory: String,
     private val isYouTube: Boolean,
 ) : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         /**
          * Copy strings
          */
@@ -34,6 +32,5 @@ abstract class AbstractSettingsResourcePatch(
                 ResourceUtils.ResourceGroup("xml", "revanced_prefs.xml")
             )
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/shared/patch/versionspoof/AbstractVersionSpoofPatch.kt b/src/main/kotlin/app/revanced/patches/shared/patch/versionspoof/AbstractVersionSpoofPatch.kt
index 27c725e8a..99f220978 100644
--- a/src/main/kotlin/app/revanced/patches/shared/patch/versionspoof/AbstractVersionSpoofPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/versionspoof/AbstractVersionSpoofPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.shared.patch.versionspoof
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.patches.shared.fingerprints.versionspoof.ClientInfoFingerprint
 import app.revanced.patches.shared.fingerprints.versionspoof.ClientInfoParentFingerprint
 import com.android.tools.smali.dexlib2.Opcode
@@ -19,7 +17,7 @@ abstract class AbstractVersionSpoofPatch(
 ) : BytecodePatch(
     listOf(ClientInfoParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         ClientInfoParentFingerprint.result?.let { parentResult ->
             ClientInfoFingerprint.also {
@@ -52,11 +50,10 @@ abstract class AbstractVersionSpoofPatch(
                         )
                         break
                     }
-                    if (insertIndex <= 0) return ClientInfoFingerprint.toErrorResult()
+                    if (insertIndex <= 0) throw ClientInfoFingerprint.exception
                 }
-            } ?: return ClientInfoFingerprint.toErrorResult()
-        } ?: return ClientInfoParentFingerprint.toErrorResult()
+            } ?: throw ClientInfoFingerprint.exception
+        } ?: throw ClientInfoParentFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/general/bytecode/patch/GeneralAdsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/general/bytecode/patch/GeneralAdsBytecodePatch.kt
index 4c347c779..fa502a469 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/general/bytecode/patch/GeneralAdsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/general/bytecode/patch/GeneralAdsBytecodePatch.kt
@@ -5,8 +5,6 @@ import app.revanced.extensions.injectHideCall
 import app.revanced.patcher.data.BytecodeContext
 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.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.AdAttribution
@@ -18,7 +16,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 @DependsOn([SharedResourceIdPatch::class])
 @Suppress("LABEL_NAME_CLASH")
 class GeneralAdsBytecodePatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         context.classes.forEach { classDef ->
             classDef.methods.forEach { method ->
                 if (!method.isWideLiteralExists(AdAttribution))
@@ -44,6 +42,5 @@ class GeneralAdsBytecodePatch : BytecodePatch() {
             }
         }
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
index 59c3913e9..2c2816276 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/general/resource/patch/GeneralAdsPatch.kt
@@ -4,10 +4,7 @@ import app.revanced.extensions.doRecursively
 import app.revanced.extensions.startsWithAny
 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.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
@@ -36,7 +33,6 @@ import org.w3c.dom.Element
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class GeneralAdsPatch : ResourcePatch {
     private val resourceFileNames = arrayOf(
         "promoted_",
@@ -59,7 +55,7 @@ class GeneralAdsPatch : ResourcePatch {
         "Top"
     )
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/AdsFilter;")
 
         context.forEach {
@@ -111,6 +107,5 @@ class GeneralAdsPatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("hide-general-ads")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/getpremium/patch/HideGetPremiumPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/getpremium/patch/HideGetPremiumPatch.kt
index 5c04f6600..26744c4b6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/getpremium/patch/HideGetPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/getpremium/patch/HideGetPremiumPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.ads.getpremium.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.util.smali.ExternalLabel
 import app.revanced.patches.youtube.ads.getpremium.fingerprints.CompactYpcOfferModuleViewFingerprint
 import app.revanced.util.integrations.Constants.PATCHES_PATH
@@ -15,7 +13,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 class HideGetPremiumPatch : BytecodePatch(
     listOf(CompactYpcOfferModuleViewFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         CompactYpcOfferModuleViewFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -37,8 +35,7 @@ class HideGetPremiumPatch : BytecodePatch(
                         """, ExternalLabel("show", getInstruction(startIndex + 2))
                 )
             }
-        } ?: return CompactYpcOfferModuleViewFingerprint.toErrorResult()
+        } ?: throw CompactYpcOfferModuleViewFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/video/patch/VideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/video/patch/VideoAdsPatch.kt
index 99048cb99..8bebeb308 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/video/patch/VideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/video/patch/VideoAdsPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.ads.video.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-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.patch.ads.AbstractAdsPatch
@@ -18,11 +15,10 @@ import app.revanced.util.integrations.Constants.ADS_PATH
 @Description("Hides ads in the video player.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class VideoAdsPatch : AbstractAdsPatch(
     "$ADS_PATH/HideVideoAdsPatch;->hideVideoAds()Z"
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         super.execute(context)
 
         /**
@@ -37,6 +33,5 @@ class VideoAdsPatch : AbstractAdsPatch(
 
         SettingsPatch.updatePatchStatus("hide-video-ads")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt
index 167d79c15..6824a9501 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/patch/ButtonContainerPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.buttomplayer.buttoncontainer.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.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
@@ -24,9 +21,8 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class ButtonContainerPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/ButtonsFilter;")
 
@@ -42,6 +38,5 @@ class ButtonContainerPatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("hide-button-container")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/patch/CommentComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/patch/CommentComponentPatch.kt
index 982167c85..cd9ff58dd 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/patch/CommentComponentPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/patch/CommentComponentPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.buttomplayer.comment.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.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
@@ -26,9 +23,8 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class CommentComponentPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/CommentsFilter;")
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/CommentsPreviewDotsFilter;")
 
@@ -44,6 +40,5 @@ class CommentComponentPatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("hide-comment-component")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/patch/FeedFlyoutPanelPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/patch/FeedFlyoutPanelPatch.kt
index c67b603bd..88e9682bf 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/patch/FeedFlyoutPanelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/patch/FeedFlyoutPanelPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.flyoutpanel.feed.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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.flyoutpanel.feed.fingerprints.BottomSheetMenuItemBuilderFingerprint
@@ -25,11 +22,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 @Description("Hides feed flyout panel components.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class FeedFlyoutPanelPatch : BytecodePatch(
     listOf(BottomSheetMenuItemBuilderFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         BottomSheetMenuItemBuilderFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -39,7 +35,7 @@ class FeedFlyoutPanelPatch : BytecodePatch(
                 val targetParameter =
                     getInstruction<ReferenceInstruction>(targetIndex - 1).reference
                 if (!targetParameter.toString().endsWith("Ljava/lang/CharSequence;"))
-                    return PatchResultError("Method signature parameter did not match: $targetParameter")
+                    throw PatchException("Method signature parameter did not match: $targetParameter")
 
                 addInstructions(
                     targetIndex + 1, """
@@ -48,7 +44,7 @@ class FeedFlyoutPanelPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return BottomSheetMenuItemBuilderFingerprint.toErrorResult()
+        } ?: throw BottomSheetMenuItemBuilderFingerprint.exception
 
         /**
          * Add settings
@@ -62,6 +58,5 @@ class FeedFlyoutPanelPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-feed-flyout-panel")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
index 1ec3c4681..984db57fa 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.flyoutpanel.oldqualitylayout.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.flyoutpanel.oldqualitylayout.fingerprints.QualityMenuViewInflateFingerprint
@@ -33,14 +30,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class OldQualityLayoutPatch : BytecodePatch(
     listOf(
         NewFlyoutPanelBuilderFingerprint,
         QualityMenuViewInflateFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         /**
          * Old method
@@ -55,7 +51,7 @@ class OldQualityLayoutPatch : BytecodePatch(
                     "invoke-static { v$insertRegister }, $FLYOUT_PANEL->enableOldQualityMenu(Landroid/widget/ListView;)V"
                 )
             }
-        } ?: return QualityMenuViewInflateFingerprint.toErrorResult()
+        } ?: throw QualityMenuViewInflateFingerprint.exception
 
         /**
          * New method
@@ -70,7 +66,7 @@ class OldQualityLayoutPatch : BytecodePatch(
                     "invoke-static { v$insertRegister }, $FLYOUT_PANEL->onFlyoutMenuCreate(Landroid/widget/LinearLayout;)V"
                 )
             }
-        } ?: return NewFlyoutPanelBuilderFingerprint.toErrorResult()
+        } ?: throw NewFlyoutPanelBuilderFingerprint.exception
 
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/VideoQualityMenuFilter;")
 
@@ -87,6 +83,5 @@ class OldQualityLayoutPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-old-quality-layout")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/patch/OldSpeedLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/patch/OldSpeedLayoutPatch.kt
index a82f70eb7..91cb36cf2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/patch/OldSpeedLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/patch/OldSpeedLayoutPatch.kt
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.flyoutpanel.oldspeedlayout.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
@@ -8,8 +8,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.extensions.or
 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.MutableField.Companion.toMutable
 import app.revanced.patches.youtube.flyoutpanel.oldspeedlayout.fingerprints.CustomPlaybackSpeedIntegrationsFingerprint
@@ -32,7 +30,7 @@ class OldSpeedLayoutPatch : BytecodePatch(
         PlaybackRateBottomSheetBuilderFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         /**
          * Find the values we need
@@ -42,7 +40,7 @@ class OldSpeedLayoutPatch : BytecodePatch(
                 PLAYBACK_RATE_BOTTOM_SHEET_CLASS = definingClass
                 PLAYBACK_RATE_BOTTOM_SHEET_BUILDER_METHOD = name
             }
-        } ?: return PlaybackRateBottomSheetClassFingerprint.toErrorResult()
+        } ?: throw PlaybackRateBottomSheetClassFingerprint.exception
 
         /**
          * Create a static field in the patch
@@ -76,7 +74,7 @@ class OldSpeedLayoutPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return CustomPlaybackSpeedIntegrationsFingerprint.toErrorResult()
+        } ?: throw CustomPlaybackSpeedIntegrationsFingerprint.exception
 
         /**
          * Input 'playbackRateBottomSheetClass' in FlyoutPanelPatch.
@@ -88,7 +86,7 @@ class OldSpeedLayoutPatch : BytecodePatch(
                     "sput-object p0, $INTEGRATIONS_CLASS_DESCRIPTOR->playbackRateBottomSheetClass:$PLAYBACK_RATE_BOTTOM_SHEET_CLASS"
                 )
             }
-        } ?: return PlaybackRateBottomSheetClassFingerprint.toErrorResult()
+        } ?: throw PlaybackRateBottomSheetClassFingerprint.exception
 
         /**
          * New method
@@ -103,11 +101,10 @@ class OldSpeedLayoutPatch : BytecodePatch(
                     "invoke-static { v$insertRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->onFlyoutMenuCreate(Landroid/widget/LinearLayout;)V"
                 )
             }
-        } ?: return NewFlyoutPanelBuilderFingerprint.toErrorResult()
+        } ?: throw NewFlyoutPanelBuilderFingerprint.exception
 
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/PlaybackSpeedMenuFilter;")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/patch/PlayerFlyoutPanelPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/patch/PlayerFlyoutPanelPatch.kt
index ed222191a..1830557b0 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/patch/PlayerFlyoutPanelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/patch/PlayerFlyoutPanelPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.flyoutpanel.player.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.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
@@ -24,9 +21,8 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class PlayerFlyoutPanelPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/PlayerFlyoutPanelsFilter;")
 
         /**
@@ -42,6 +38,5 @@ class PlayerFlyoutPanelPatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("hide-player-flyout-panel")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/patch/HideAutoplayPreviewPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/patch/HideAutoplayPreviewPatch.kt
index f2449848a..82ed41012 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/patch/HideAutoplayPreviewPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/patch/HideAutoplayPreviewPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.fullscreen.autoplaypreview.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -34,11 +31,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideAutoplayPreviewPatch : BytecodePatch(
     listOf(LayoutConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LayoutConstructorFingerprint.result?.let {
             it.mutableMethod.apply {
                 val dummyRegister =
@@ -54,7 +50,7 @@ class HideAutoplayPreviewPatch : BytecodePatch(
                         """, ExternalLabel("hidden", getInstruction(jumpIndex))
                 )
             }
-        } ?: return LayoutConstructorFingerprint.toErrorResult()
+        } ?: throw LayoutConstructorFingerprint.exception
 
         /**
          * Add settings
@@ -68,7 +64,6 @@ class HideAutoplayPreviewPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-autoplay-preview")
 
-        return PatchResultSuccess()
     }
 }
 
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/patch/CompactControlsOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/patch/CompactControlsOverlayPatch.kt
index 9be5e41fe..6d79e4449 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/patch/CompactControlsOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/patch/CompactControlsOverlayPatch.kt
@@ -1,16 +1,12 @@
 package app.revanced.patches.youtube.fullscreen.compactcontrolsoverlay.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -31,11 +27,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class CompactControlsOverlayPatch : BytecodePatch(
     listOf(YouTubeControlsOverlayFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         YouTubeControlsOverlayFingerprint.result?.let {
             with(
@@ -55,7 +50,7 @@ class CompactControlsOverlayPatch : BytecodePatch(
                     """
                 )
             }
-        } ?: return YouTubeControlsOverlayFingerprint.toErrorResult()
+        } ?: throw YouTubeControlsOverlayFingerprint.exception
 
         /**
          * Add settings
@@ -69,6 +64,5 @@ class CompactControlsOverlayPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-compact-controls-overlay")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/patch/HideEndScreenOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/patch/HideEndScreenOverlayPatch.kt
index c812e15cb..ec86d5c39 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/patch/HideEndScreenOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/patch/HideEndScreenOverlayPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.fullscreen.endscreenoverlay.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -29,11 +26,10 @@ import app.revanced.util.integrations.Constants.FULLSCREEN
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideEndScreenOverlayPatch : BytecodePatch(
     listOf(EndScreenResultsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         EndScreenResultsFingerprint.result?.let {
             it.mutableMethod.apply {
                 addInstructionsWithLabels(
@@ -45,7 +41,7 @@ class HideEndScreenOverlayPatch : BytecodePatch(
                 """, ExternalLabel("show", getInstruction(0))
                 )
             }
-        } ?: return EndScreenResultsFingerprint.toErrorResult()
+        } ?: throw EndScreenResultsFingerprint.exception
 
         /**
          * Add settings
@@ -59,6 +55,5 @@ class HideEndScreenOverlayPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-endscreen-overlay")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt
index 3ddfdb43f..da16e9b02 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt
@@ -1,9 +1,8 @@
 package app.revanced.patches.youtube.fullscreen.fullscreenpanels.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
@@ -11,8 +10,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 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.util.smali.ExternalLabel
@@ -43,7 +40,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideFullscreenPanelsPatch : BytecodePatch(
     listOf(
         FullscreenEngagementPanelFingerprint,
@@ -51,7 +47,7 @@ class HideFullscreenPanelsPatch : BytecodePatch(
         LayoutConstructorFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         FullscreenEngagementPanelFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -63,7 +59,7 @@ class HideFullscreenPanelsPatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $FULLSCREEN->hideFullscreenPanels(Landroidx/coordinatorlayout/widget/CoordinatorLayout;)V"
                 )
             }
-        } ?: return FullscreenEngagementPanelFingerprint.toErrorResult()
+        } ?: throw FullscreenEngagementPanelFingerprint.exception
 
         FullscreenViewAdderFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -100,7 +96,7 @@ class HideFullscreenPanelsPatch : BytecodePatch(
                         """, ExternalLabel("hidden", getInstruction(invokeIndex + 1))
                 )
             }
-        } ?: return LayoutConstructorFingerprint.toErrorResult()
+        } ?: throw LayoutConstructorFingerprint.exception
 
         /**
          * Add settings
@@ -114,6 +110,5 @@ class HideFullscreenPanelsPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-fullscreen-panels")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/patch/LandScapeModePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/patch/LandScapeModePatch.kt
index f45665a50..8c6a0b636 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/patch/LandScapeModePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/patch/LandScapeModePatch.kt
@@ -1,17 +1,14 @@
 package app.revanced.patches.youtube.fullscreen.landscapemode.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.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.patches.youtube.fullscreen.landscapemode.fingerprints.OrientationParentFingerprint
@@ -27,20 +24,19 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Disable landscape mode when entering fullscreen.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class LandScapeModePatch : BytecodePatch(
     listOf(OrientationParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         OrientationParentFingerprint.result?.classDef?.let { classDef ->
             arrayOf(
                 OrientationPrimaryFingerprint,
                 OrientationSecondaryFingerprint
             ).forEach {
                 it.also { it.resolve(context, classDef) }.result?.injectOverride()
-                    ?: return it.toErrorResult()
+                    ?: throw it.exception
             }
-        } ?: return OrientationParentFingerprint.toErrorResult()
+        } ?: throw OrientationParentFingerprint.exception
 
         /**
          * Add settings
@@ -54,7 +50,6 @@ class LandScapeModePatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("disable-landscape-mode")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/patch/QuickActionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/patch/QuickActionsPatch.kt
index cd4fe2478..5c71d5c60 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/patch/QuickActionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/patch/QuickActionsPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.fullscreen.quickactions.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.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
@@ -26,9 +23,8 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class QuickActionsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/QuickActionFilter;")
 
         /**
@@ -43,6 +39,5 @@ class QuickActionsPatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("hide-quick-actions")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/patch/AccountMenuPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/patch/AccountMenuPatch.kt
index 63780496e..55e7d42ce 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/patch/AccountMenuPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/patch/AccountMenuPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.general.accountmenu.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.patches.youtube.general.accountmenu.fingerprints.AccountMenuFingerprint
@@ -31,11 +28,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class AccountMenuPatch : BytecodePatch(
     listOf(AccountMenuParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         AccountMenuParentFingerprint.result?.let { parentResult ->
             AccountMenuFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let {
@@ -48,7 +44,7 @@ class AccountMenuPatch : BytecodePatch(
                         "invoke-static {v$register}, $GENERAL->hideAccountMenu(Landroid/text/Spanned;)V"
                     )
                 }
-            } ?: return AccountMenuFingerprint.toErrorResult()
+            } ?: throw AccountMenuFingerprint.exception
 
             parentResult.mutableMethod.apply {
                 val endIndex = parentResult.scanResult.patternScanResult!!.endIndex
@@ -59,7 +55,7 @@ class AccountMenuPatch : BytecodePatch(
                     "sput-object v$register, $GENERAL->compactLink:Landroid/view/View;"
                 )
             }
-        } ?: return AccountMenuParentFingerprint.toErrorResult()
+        } ?: throw AccountMenuParentFingerprint.exception
 
         /**
          * Add settings
@@ -73,6 +69,5 @@ class AccountMenuPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-account-menu")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/patch/AutoCaptionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/patch/AutoCaptionsPatch.kt
index b827ba854..cb261ae7f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/patch/AutoCaptionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/patch/AutoCaptionsPatch.kt
@@ -1,17 +1,14 @@
 package app.revanced.patches.youtube.general.autocaptions.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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.smali.ExternalLabel
@@ -35,7 +32,6 @@ import app.revanced.util.integrations.Constants.GENERAL
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class AutoCaptionsPatch : BytecodePatch(
     listOf(
         StartVideoInformerFingerprint,
@@ -43,7 +39,7 @@ class AutoCaptionsPatch : BytecodePatch(
         SubtitleTrackFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         listOf(
             StartVideoInformerFingerprint.toPatch(Status.DISABLED),
             SubtitleButtonControllerFingerprint.toPatch(Status.ENABLED)
@@ -53,7 +49,7 @@ class AutoCaptionsPatch : BytecodePatch(
                     const/4 v0, ${status.value}
                     sput-boolean v0, $GENERAL->captionsButtonStatus:Z
                     """
-            ) ?: return fingerprint.toErrorResult()
+            ) ?: throw fingerprint.exception
         }
 
         SubtitleTrackFingerprint.result?.let {
@@ -70,7 +66,7 @@ class AutoCaptionsPatch : BytecodePatch(
                         """, ExternalLabel("auto_captions_shown", getInstruction(0))
                 )
             }
-        } ?: return SubtitleTrackFingerprint.toErrorResult()
+        } ?: throw SubtitleTrackFingerprint.exception
 
         /**
          * Add settings
@@ -84,7 +80,6 @@ class AutoCaptionsPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("disable-auto-captions")
 
-        return PatchResultSuccess()
     }
 
     private fun MethodFingerprint.toPatch(visibility: Status) = SetStatus(this, visibility)
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt
index 3cf9a2d14..51070d06a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/patch/PlayerPopupPanelsPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.general.autopopuppanels.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -23,11 +20,10 @@ import app.revanced.util.integrations.Constants.GENERAL
 @Description("Hide automatic popup panels (playlist or live chat) on video player.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class PlayerPopupPanelsPatch : BytecodePatch(
     listOf(EngagementPanelControllerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         EngagementPanelControllerFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -42,7 +38,7 @@ class PlayerPopupPanelsPatch : BytecodePatch(
                         """, ExternalLabel("player_popup_panels_shown", getInstruction(0))
                 )
             }
-        } ?: return EngagementPanelControllerFingerprint.toErrorResult()
+        } ?: throw EngagementPanelControllerFingerprint.exception
 
         /**
          * Add settings
@@ -56,6 +52,5 @@ class PlayerPopupPanelsPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-auto-player-popup-panels")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/patch/CategoryBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/patch/CategoryBarPatch.kt
index 83225e515..ff8b2b184 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/patch/CategoryBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/patch/CategoryBarPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.general.categorybar.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.general.categorybar.fingerprints.FilterBarHeightFingerprint
@@ -33,7 +30,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class CategoryBarPatch : BytecodePatch(
     listOf(
         FilterBarHeightFingerprint,
@@ -41,7 +37,7 @@ class CategoryBarPatch : BytecodePatch(
         SearchResultsChipBarFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         FilterBarHeightFingerprint.patch<TwoRegisterInstruction> { register ->
             """
@@ -74,7 +70,6 @@ class CategoryBarPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-category-bar")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
@@ -93,6 +88,6 @@ class CategoryBarPatch : BytecodePatch(
 
                     addInstructions(insertIndex, instructions(register))
                 }
-            } ?: throw toErrorResult()
+            } ?: throw exception
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/patch/ChannelListSubMenuPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/patch/ChannelListSubMenuPatch.kt
index 38e776564..c68d0411e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/patch/ChannelListSubMenuPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/patch/ChannelListSubMenuPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.general.channellistsubmenu.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.general.channellistsubmenu.fingerprints.ChannelListSubMenuFingerprint
@@ -29,11 +26,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class ChannelListSubMenuPatch : BytecodePatch(
     listOf(ChannelListSubMenuFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         ChannelListSubMenuFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -45,7 +41,7 @@ class ChannelListSubMenuPatch : BytecodePatch(
                     "invoke-static {v$register}, $GENERAL->hideChannelListSubMenu(Landroid/view/View;)V"
                 )
             }
-        } ?: return ChannelListSubMenuFingerprint.toErrorResult()
+        } ?: throw ChannelListSubMenuFingerprint.exception
 
         /**
          * Add settings
@@ -59,6 +55,5 @@ class ChannelListSubMenuPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-channel-avatar-section")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt
index d3dfcf032..9c2580117 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/patch/CrowdfundingBoxPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.general.crowdfundingbox.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.general.crowdfundingbox.fingerprints.CrowdfundingBoxFingerprint
@@ -29,11 +26,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class CrowdfundingBoxPatch : BytecodePatch(
     listOf(CrowdfundingBoxFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         CrowdfundingBoxFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -45,7 +41,7 @@ class CrowdfundingBoxPatch : BytecodePatch(
                     "invoke-static {v$register}, $GENERAL->hideCrowdfundingBox(Landroid/view/View;)V"
                 )
             }
-        } ?: return CrowdfundingBoxFingerprint.toErrorResult()
+        } ?: throw CrowdfundingBoxFingerprint.exception
 
         /**
          * Add settings
@@ -59,6 +55,5 @@ class CrowdfundingBoxPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-crowdfunding-box")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/patch/DescriptionComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/patch/DescriptionComponentsPatch.kt
index d3e624a6e..f77da9e18 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/patch/DescriptionComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/patch/DescriptionComponentsPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.youtube.general.descriptions.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.utils.annotations.YouTubeCompatibility
@@ -25,9 +22,8 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class DescriptionComponentsPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/DescriptionsFilter;")
 
         /**
@@ -44,6 +40,5 @@ class DescriptionComponentsPatch : BytecodePatch() {
 
         context.updatePatchStatus("DescriptionComponent")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/patch/FloatingMicrophonePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/patch/FloatingMicrophonePatch.kt
index add3c7900..88e9afbbb 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/patch/FloatingMicrophonePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/patch/FloatingMicrophonePatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.general.floatingmicrophone.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.general.floatingmicrophone.fingerprints.FloatingMicrophoneFingerprint
@@ -29,11 +26,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class FloatingMicrophonePatch : BytecodePatch(
     listOf(FloatingMicrophoneFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         FloatingMicrophoneFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -47,7 +43,7 @@ class FloatingMicrophonePatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return FloatingMicrophoneFingerprint.toErrorResult()
+        } ?: throw FloatingMicrophoneFingerprint.exception
 
         /**
          * Add settings
@@ -61,6 +57,5 @@ class FloatingMicrophonePatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-floating-microphone")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/headerswitch/patch/HeaderSwitchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/headerswitch/patch/HeaderSwitchPatch.kt
index bd4fb3cad..ccaa79494 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/headerswitch/patch/HeaderSwitchPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/headerswitch/patch/HeaderSwitchPatch.kt
@@ -3,13 +3,10 @@ package app.revanced.patches.youtube.general.headerswitch.patch
 import app.revanced.extensions.findMutableMethodOf
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.utils.annotations.YouTubeCompatibility
@@ -31,10 +28,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 @Suppress("LABEL_NAME_CLASH")
 class HeaderSwitchPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         context.classes.forEach { classDef ->
             classDef.methods.forEach { method ->
                 if (!method.isWideLiteralExists(WordMarkHeader))
@@ -70,6 +66,5 @@ class HeaderSwitchPatch : BytecodePatch() {
 
         SettingsPatch.updatePatchStatus("header-switch")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/patch/LatestVideosButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/patch/LatestVideosButtonPatch.kt
index f99ef20b6..2b2f11e55 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/patch/LatestVideosButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/patch/LatestVideosButtonPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.general.latestvideosbutton.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.general.latestvideosbutton.fingerprints.LatestVideosButtonFingerprint
@@ -29,11 +26,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class LatestVideosButtonPatch : BytecodePatch(
     listOf(LatestVideosButtonFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LatestVideosButtonFingerprint.result?.let {
             it.mutableMethod.apply {
                 val targetIndex = it.scanResult.patternScanResult!!.endIndex
@@ -44,7 +40,7 @@ class LatestVideosButtonPatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $GENERAL->hideLatestVideosButton(Landroid/view/View;)V"
                 )
             }
-        } ?: return LatestVideosButtonFingerprint.toErrorResult()
+        } ?: throw LatestVideosButtonFingerprint.exception
 
         /**
          * Add settings
@@ -58,6 +54,5 @@ class LatestVideosButtonPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-latest-videos-button")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/layout/patch/LayoutComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/layout/patch/LayoutComponentsPatch.kt
index 8a8fee743..ebde2b9a0 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/layout/patch/LayoutComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/layout/patch/LayoutComponentsPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.youtube.general.layout.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.utils.annotations.YouTubeCompatibility
@@ -25,9 +22,8 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class LayoutComponentsPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/CommunityPostFilter;")
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/LayoutComponentsFilter;")
 
@@ -48,6 +44,5 @@ class LayoutComponentsPatch : BytecodePatch() {
 
         context.updatePatchStatus("LayoutComponent")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/patch/LoadMoreButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/patch/LoadMoreButtonPatch.kt
index f2eb3115c..614b4d0b9 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/patch/LoadMoreButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/patch/LoadMoreButtonPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.general.loadmorebutton.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.general.loadmorebutton.fingerprints.LoadMoreButtonFingerprint
@@ -29,11 +26,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class LoadMoreButtonPatch : BytecodePatch(
     listOf(LoadMoreButtonFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         LoadMoreButtonFingerprint.result?.let {
             it.mutableMethod.apply {
                 val targetIndex = it.scanResult.patternScanResult!!.endIndex
@@ -43,7 +39,7 @@ class LoadMoreButtonPatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $GENERAL->hideLoadMoreButton(Landroid/view/View;)V"
                 )
             }
-        } ?: return LoadMoreButtonFingerprint.toErrorResult()
+        } ?: throw LoadMoreButtonFingerprint.exception
 
         /**
          * Add settings
@@ -57,6 +53,5 @@ class LoadMoreButtonPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-load-more-button")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/patch/MixPlaylistsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/patch/MixPlaylistsPatch.kt
index fdabd0be4..23e55b728 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/patch/MixPlaylistsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/patch/MixPlaylistsPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.general.mixplaylists.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.proxy.mutableTypes.MutableMethod
@@ -30,7 +27,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 @Description("Hides mix playlists from home feed and video player.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class MixPlaylistsPatch : BytecodePatch(
     listOf(
         BottomPanelOverlayTextFingerprint,
@@ -38,7 +34,7 @@ class MixPlaylistsPatch : BytecodePatch(
         EmptyFlatBufferFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         /**
          * Hide MixPlaylists when tablet UI is turned on
@@ -54,7 +50,7 @@ class MixPlaylistsPatch : BytecodePatch(
                     "invoke-static {v$insertRegister}, $GENERAL->hideMixPlaylists(Landroid/view/View;)V"
                 )
             }
-        } ?: return BottomPanelOverlayTextFingerprint.toErrorResult()
+        } ?: throw BottomPanelOverlayTextFingerprint.exception
 
         /**
          * Separated from bytebuffer patch
@@ -62,7 +58,7 @@ class MixPlaylistsPatch : BytecodePatch(
          */
         ElementParserFingerprint.result
             ?: EmptyFlatBufferFingerprint.result
-            ?: throw EmptyFlatBufferFingerprint.toErrorResult()
+            ?: throw EmptyFlatBufferFingerprint.exception
 
 
         /**
@@ -117,7 +113,6 @@ class MixPlaylistsPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-mix-playlists")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/personalinformation/patch/HideEmailAddressPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/personalinformation/patch/HideEmailAddressPatch.kt
index 63c67d95d..6c1d8e467 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/personalinformation/patch/HideEmailAddressPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/personalinformation/patch/HideEmailAddressPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.general.personalinformation.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.general.personalinformation.fingerprints.AccountSwitcherAccessibilityLabelFingerprint
@@ -23,11 +20,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Hides the handle in the account switcher.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideEmailAddressPatch : BytecodePatch(
     listOf(AccountSwitcherAccessibilityLabelFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         AccountSwitcherAccessibilityLabelFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -41,7 +37,7 @@ class HideEmailAddressPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return AccountSwitcherAccessibilityLabelFingerprint.toErrorResult()
+        } ?: throw AccountSwitcherAccessibilityLabelFingerprint.exception
 
         /**
          * Add settings
@@ -55,6 +51,5 @@ class HideEmailAddressPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-email-address")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/patch/HideSnackBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/patch/HideSnackBarPatch.kt
index 6fcc39027..35b33775d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/patch/HideSnackBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/patch/HideSnackBarPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.general.snackbar.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -23,11 +20,10 @@ import app.revanced.util.integrations.Constants.GENERAL
 @Description("Hides the snack bar action popup.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideSnackBarPatch : BytecodePatch(
     listOf(HideSnackBarFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         HideSnackBarFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -40,7 +36,7 @@ class HideSnackBarPatch : BytecodePatch(
                         """, ExternalLabel("default", getInstruction(0))
                 )
             }
-        } ?: return HideSnackBarFingerprint.toErrorResult()
+        } ?: throw HideSnackBarFingerprint.exception
 
         /**
          * Add settings
@@ -54,6 +50,5 @@ class HideSnackBarPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-snack-bar")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/patch/SuggestionsShelfPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/patch/SuggestionsShelfPatch.kt
index ea643d787..98364a80c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/patch/SuggestionsShelfPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/patch/SuggestionsShelfPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.general.suggestions.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.general.suggestions.fingerprints.BreakingNewsFingerprint
@@ -29,11 +26,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class SuggestionsShelfPatch : BytecodePatch(
     listOf(BreakingNewsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         BreakingNewsFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -45,7 +41,7 @@ class SuggestionsShelfPatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $GENERAL->hideBreakingNewsShelf(Landroid/view/View;)V"
                 )
             }
-        } ?: return BreakingNewsFingerprint.toErrorResult()
+        } ?: throw BreakingNewsFingerprint.exception
 
         /*
         SuggestionContentsBuilderFingerprint.result?.let {
@@ -58,7 +54,7 @@ class SuggestionsShelfPatch : BytecodePatch(
                         """ + emptyComponentLabel, ExternalLabel("not_an_ad", getInstruction(2))
                 )
             }
-        } ?: return SuggestionContentsBuilderFingerprint.toErrorResult()
+        } ?: throw SuggestionContentsBuilderFingerprint.exception
          */
 
 
@@ -74,6 +70,5 @@ class SuggestionsShelfPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-suggestions-shelf")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
index e01d49475..f6a49caaa 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
@@ -1,18 +1,14 @@
 package app.revanced.patches.youtube.general.tabletminiplayer.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -38,7 +34,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class TabletMiniPlayerPatch : BytecodePatch(
     listOf(
         MiniPlayerDimensionsCalculatorFingerprint,
@@ -46,7 +41,7 @@ class TabletMiniPlayerPatch : BytecodePatch(
         MiniPlayerOverrideFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         MiniPlayerDimensionsCalculatorFingerprint.result?.let { parentResult ->
             MiniPlayerOverrideNoContextFingerprint.also {
@@ -60,8 +55,8 @@ class TabletMiniPlayerPatch : BytecodePatch(
                     method.implementation!!.instructions.size - 1,
                     parameterRegister
                 )
-            } ?: return MiniPlayerOverrideNoContextFingerprint.toErrorResult()
-        } ?: return MiniPlayerDimensionsCalculatorFingerprint.toErrorResult()
+            } ?: throw MiniPlayerOverrideNoContextFingerprint.exception
+        } ?: throw MiniPlayerDimensionsCalculatorFingerprint.exception
 
         MiniPlayerOverrideFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -70,10 +65,10 @@ class TabletMiniPlayerPatch : BytecodePatch(
                     .getMethod() as MutableMethod)
                     .instructionProxyCall()
             }
-        } ?: return MiniPlayerOverrideFingerprint.toErrorResult()
+        } ?: throw MiniPlayerOverrideFingerprint.exception
 
         MiniPlayerResponseModelSizeCheckFingerprint.result?.addProxyCall()
-            ?: return MiniPlayerResponseModelSizeCheckFingerprint.toErrorResult()
+            ?: throw MiniPlayerResponseModelSizeCheckFingerprint.exception
 
         /**
          * Add settings
@@ -87,7 +82,6 @@ class TabletMiniPlayerPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-tablet-mini-player")
 
-        return PatchResultSuccess()
     }
 
     // helper methods
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/patch/TrendingSearchesPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/patch/TrendingSearchesPatch.kt
index 86b7e4324..43f7b67c9 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/patch/TrendingSearchesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/patch/TrendingSearchesPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.general.trendingsearches.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.general.trendingsearches.fingerprints.SearchBarEntryFingerprint
@@ -34,11 +31,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class TrendingSearchesPatch : BytecodePatch(
     listOf(SearchBarEntryFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SearchBarEntryFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -59,7 +55,7 @@ class TrendingSearchesPatch : BytecodePatch(
                         )
                     }
             }
-        } ?: return SearchBarEntryFingerprint.toErrorResult()
+        } ?: throw SearchBarEntryFingerprint.exception
 
         /**
          * Add settings
@@ -73,7 +69,6 @@ class TrendingSearchesPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-trending-searches")
 
-        return PatchResultSuccess()
     }
 
     private enum class SearchTerm(val resourceId: Long, val value: Int) {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/patch/WideSearchBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/patch/WideSearchBarPatch.kt
index 8242d9a12..45b65bee3 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/patch/WideSearchBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/patch/WideSearchBarPatch.kt
@@ -1,16 +1,12 @@
 package app.revanced.patches.youtube.general.widesearchbar.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -32,14 +28,13 @@ import app.revanced.util.integrations.Constants.GENERAL
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class WideSearchBarPatch : BytecodePatch(
     listOf(
         SetActionBarRingoFingerprint,
         SetToolBarPaddingFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         arrayOf(
             SetActionBarRingoFingerprint,
@@ -75,7 +70,6 @@ class WideSearchBarPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-wide-search-bar")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
@@ -95,7 +89,7 @@ class WideSearchBarPatch : BytecodePatch(
                             """
                     )
                 }
-            } ?: throw toErrorResult()
+            } ?: throw exception
         }
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt
index 30b5da3e1..e9ad6e7cf 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconMMTPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.layout.branding.icon.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.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
@@ -19,13 +16,11 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon
 @Description("Changes the YouTube launcher icon to MMT.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class CustomBrandingIconMMTPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         context.customIcon("mmt")
         context.updatePatchStatusIcon("mmt")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt
index d5081336f..d91012552 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconRevancifyBluePatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.layout.branding.icon.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.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
@@ -19,13 +16,11 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon
 @Description("Changes the YouTube launcher icon to Revancify Blue.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class CustomBrandingIconRevancifyBluePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         context.customIcon("revancify-blue")
         context.updatePatchStatusIcon("revancify_blue")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt
index e265f6d42..abf7526cb 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingIconRevancifyRedPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.layout.branding.icon.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.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
@@ -19,13 +16,11 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon
 @Description("Changes the YouTube launcher icon to Revancify Red.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class CustomBrandingIconRevancifyRedPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         context.customIcon("revancify-red")
         context.updatePatchStatusIcon("revancify_red")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/CustomBrandingNamePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/CustomBrandingNamePatch.kt
index b35fc2451..8cf14eea7 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/CustomBrandingNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/CustomBrandingNamePatch.kt
@@ -2,13 +2,10 @@ package app.revanced.patches.youtube.layout.branding.name.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.OptionsContainer
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.PatchOption
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-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
@@ -26,12 +23,11 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusLabel
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class CustomBrandingNamePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         val appName = YouTubeAppName
-            ?: throw PatchResultError("Invalid app name.")
+            ?: throw PatchException("Invalid app name.")
 
         context.xmlEditor["res/values/strings.xml"].use { editor ->
             val document = editor.file
@@ -51,7 +47,6 @@ class CustomBrandingNamePatch : ResourcePatch {
 
         context.updatePatchStatusLabel("$appName")
 
-        return PatchResultSuccess()
     }
 
     companion object : OptionsContainer() {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/RemoveElementsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/RemoveElementsPatch.kt
index 04386cead..5833994a7 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/RemoveElementsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/patch/RemoveElementsPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.youtube.layout.branding.name.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 kotlin.io.path.exists
 
 class RemoveElementsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         LANGUAGE_LIST.forEach { path ->
             val resDirectory = context["res"]
@@ -23,7 +21,6 @@ class RemoveElementsPatch : ResourcePatch {
             }
         }
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/patch/DoubleTapOverlayBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/patch/DoubleTapOverlayBackgroundPatch.kt
index 751ecd15b..5b8a3a767 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/patch/DoubleTapOverlayBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/patch/DoubleTapOverlayBackgroundPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.layout.doubletapbackground.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.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
@@ -17,9 +14,8 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 @Description("Hides the double tap dark filter layer.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class DoubleTapOverlayBackgroundPatch : 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")
@@ -48,7 +44,6 @@ class DoubleTapOverlayBackgroundPatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("hide-double-tap-overlay-filter")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/patch/DoubleTapLengthPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/patch/DoubleTapLengthPatch.kt
index 050aeacaa..42a0bcc5b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/patch/DoubleTapLengthPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/patch/DoubleTapLengthPatch.kt
@@ -2,13 +2,10 @@ package app.revanced.patches.youtube.layout.doubletaplength.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.OptionsContainer
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.PatchOption
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-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
@@ -23,9 +20,8 @@ import app.revanced.util.resources.ResourceUtils.copyResources
 @Description("Add 'double-tap to seek' value.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class DoubleTapLengthPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         val arrayPath = "res/values-v21/arrays.xml"
         val entriesName = "double_tap_length_entries"
         val entryValueName = "double_tap_length_values"
@@ -42,7 +38,7 @@ class DoubleTapLengthPatch : ResourcePatch {
         )
 
         val length = DoubleTapLengthArrays
-            ?: return PatchResultError("Invalid double-tap length array.")
+            ?: throw PatchException("Invalid double-tap length array.")
 
         val splits = length.replace(" ", "").split(",")
         if (splits.isEmpty()) throw IllegalArgumentException("Invalid double-tap length elements")
@@ -54,7 +50,6 @@ class DoubleTapLengthPatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("custom-double-tap-length")
 
-        return PatchResultSuccess()
     }
 
     companion object : OptionsContainer() {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/patch/PlayerButtonBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/patch/PlayerButtonBackgroundPatch.kt
index 24fbbf131..6993d8210 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/patch/PlayerButtonBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/patch/PlayerButtonBackgroundPatch.kt
@@ -3,10 +3,7 @@ package app.revanced.patches.youtube.layout.forcebackground.patch
 import app.revanced.extensions.doRecursively
 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.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
@@ -19,10 +16,9 @@ import org.w3c.dom.Element
 @Description("Force hides the background from the video player buttons.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class PlayerButtonBackgroundPatch : ResourcePatch {
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         context.xmlEditor["res/drawable/player_button_circle_background.xml"].use { editor ->
             editor.file.doRecursively { node ->
                 arrayOf("color").forEach replacement@{ replacement ->
@@ -44,6 +40,5 @@ class PlayerButtonBackgroundPatch : ResourcePatch {
                 )
         )
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/forceheader/patch/PremiumHeadingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/forceheader/patch/PremiumHeadingPatch.kt
index 2816deafd..f5d197f4b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/forceheader/patch/PremiumHeadingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/forceheader/patch/PremiumHeadingPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.youtube.layout.forceheader.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.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.patcher.patch.annotations.Patch
@@ -21,11 +18,11 @@ import kotlin.io.path.exists
 @Description("Forces premium heading on the homepage.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 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")
@@ -37,7 +34,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,
@@ -60,6 +57,5 @@ class PremiumHeadingPatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("force-premium-heading")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/patch/MaterialYouPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/patch/MaterialYouPatch.kt
index c9276c645..98fbedd55 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/patch/MaterialYouPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/patch/MaterialYouPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.layout.materialyou.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.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
@@ -28,9 +25,8 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class MaterialYouPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         arrayOf(
             ResourceUtils.ResourceGroup(
@@ -60,6 +56,5 @@ class MaterialYouPatch : ResourcePatch {
 
         isMonetPatchIncluded = true
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/optimize/patch/OptimizeResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/optimize/patch/OptimizeResourcePatch.kt
index d8e580df5..5f45ee921 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/optimize/patch/OptimizeResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/optimize/patch/OptimizeResourcePatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.layout.optimize.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.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,12 +19,10 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class OptimizeResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         SettingsPatch.updatePatchStatus("optimize-resource")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/optimize/patch/RedundantResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/optimize/patch/RedundantResourcePatch.kt
index 9ae355f9d..f32883434 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/optimize/patch/RedundantResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/optimize/patch/RedundantResourcePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.optimize.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.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
@@ -12,7 +10,7 @@ import java.nio.file.Path
 import java.nio.file.StandardCopyOption
 
 class RedundantResourcePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         // Convert universal APK to anti-split APK
         arrayOf(
@@ -55,7 +53,6 @@ class RedundantResourcePatch : ResourcePatch {
             )
         )
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/patch/PiPNotificationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/patch/PiPNotificationPatch.kt
index 2601ad36c..1442aac9a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/patch/PiPNotificationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/patch/PiPNotificationPatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.youtube.layout.pipnotification.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.youtube.layout.pipnotification.fingerprints.PrimaryPiPFingerprint
@@ -21,14 +18,13 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 @Description("Disable pip notification when you first launch pip mode.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class PiPNotificationPatch : BytecodePatch(
     listOf(
         PrimaryPiPFingerprint,
         SecondaryPiPFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         arrayOf(
             PrimaryPiPFingerprint,
@@ -41,7 +37,7 @@ class PiPNotificationPatch : BytecodePatch(
                         "return-void"
                     )
                 }
-            } ?: return fingerprint.toErrorResult()
+            } ?: throw fingerprint.exception
         }
 
         /**
@@ -49,6 +45,5 @@ class PiPNotificationPatch : BytecodePatch(
          */
         SettingsPatch.updatePatchStatus("hide-pip-notification")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/patch/AddSplashAnimationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/patch/AddSplashAnimationPatch.kt
index 185aa7e4c..c4e8086b2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/patch/AddSplashAnimationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/patch/AddSplashAnimationPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.layout.splashanimation.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.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.utils.annotations.YouTubeCompatibility
@@ -18,9 +15,8 @@ import kotlin.io.path.exists
 @Name("Add splash animation")
 @Description("Adds splash animation, which was removed in YT v18.19.36+. This patch cannot be used with 'custom-branding-icon' patch")
 @YouTubeCompatibility
-@Version("0.0.1")
 class AddSplashAnimationPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         val resDirectory = context["res"]
         val targetXml = resDirectory.resolve("drawable").resolve("avd_anim.xml").toPath()
@@ -61,6 +57,5 @@ class AddSplashAnimationPatch : ResourcePatch {
             context.copyXmlNode("youtube/splashscreen", "values-v31/styles.xml", "resources")
         }
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/GeneralThemePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/GeneralThemePatch.kt
index 09934fa0d..4b5ef04c6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/GeneralThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/GeneralThemePatch.kt
@@ -1,8 +1,6 @@
 package app.revanced.patches.youtube.layout.theme.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.youtube.utils.litho.patch.LithoThemePatch
@@ -11,7 +9,7 @@ import org.w3c.dom.Element
 
 @DependsOn([LithoThemePatch::class])
 class GeneralThemePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         LithoThemePatch.injectCall("$UTILS_PATH/LithoThemePatch;->applyLithoTheme(I)I")
 
@@ -88,7 +86,6 @@ class GeneralThemePatch : ResourcePatch {
             }
         }
 
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt
index 01fa0f959..ca9a18ec9 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt
@@ -2,13 +2,10 @@ package app.revanced.patches.youtube.layout.theme.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.OptionsContainer
+import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.PatchOption
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-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
@@ -28,9 +25,8 @@ import org.w3c.dom.Element
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class ThemePatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         arrayOf("values", "values-v31").forEach { context.setTheme(it) }
 
@@ -38,12 +34,11 @@ class ThemePatch : ResourcePatch {
 
         context.updatePatchStatusTheme(currentTheme)
 
-        return PatchResultSuccess()
     }
 
     private fun ResourceContext.setTheme(valuesPath: String) {
         val darkThemeColor = darkThemeBackgroundColor
-            ?: throw PatchResultError("Invalid color.")
+            ?: throw PatchException("Invalid color.")
 
         this.xmlEditor["res/$valuesPath/colors.xml"].use { editor ->
             val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/patch/TooltipContentViewPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/patch/TooltipContentViewPatch.kt
index f5f2d8684..98cbc53bb 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/patch/TooltipContentViewPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/patch/TooltipContentViewPatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.youtube.layout.tooltip.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.youtube.layout.tooltip.fingerprints.TooltipContentViewFingerprint
@@ -26,22 +23,20 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class TooltipContentViewPatch : BytecodePatch(
     listOf(TooltipContentViewFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         TooltipContentViewFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "return-void"
-        ) ?: return TooltipContentViewFingerprint.toErrorResult()
+        ) ?: throw TooltipContentViewFingerprint.exception
 
         /**
          * Add settings
          */
         SettingsPatch.updatePatchStatus("hide-tooltip-content")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/patch/PowerSaveModePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/patch/PowerSaveModePatch.kt
index 437d1eed8..9772b60e3 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/patch/PowerSaveModePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/patch/PowerSaveModePatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.misc.ambientmode.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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.misc.ambientmode.fingerprints.PowerSaveModeFingerprint
@@ -27,11 +24,10 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 @Description("Bypass ambient mode restrictions in battery saver mode.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class PowerSaveModePatch : BytecodePatch(
     listOf(PowerSaveModeFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         PowerSaveModeFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -55,9 +51,9 @@ class PowerSaveModePatch : BytecodePatch(
                     )
                 }
                 if (insertIndex == -1)
-                    return PatchResultError("Couldn't find PowerManager reference")
+                    throw PatchException("Couldn't find PowerManager reference")
             }
-        } ?: return PowerSaveModeFingerprint.toErrorResult()
+        } ?: throw PowerSaveModeFingerprint.exception
 
         /**
          * Add settings
@@ -70,6 +66,5 @@ class PowerSaveModePatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("bypass-ambient-mode-restrictions")
 
-        return PatchResultSuccess()
     }
 }
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 40de298ed..b84b4b269 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
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.misc.debugging.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.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
@@ -17,9 +14,8 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 @Description("Adds debugging options.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.2")
 class DebuggingPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         /**
          * Add settings
@@ -33,6 +29,5 @@ class DebuggingPatch : ResourcePatch {
         SettingsPatch.updatePatchStatus("enable-debug-logging")
 
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/patch/ExternalBrowserPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/patch/ExternalBrowserPatch.kt
index a6c51082c..6c086dbc5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/patch/ExternalBrowserPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/patch/ExternalBrowserPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.misc.externalbrowser.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.misc.externalbrowser.fingerprints.ExternalBrowserPrimaryFingerprint
@@ -26,7 +23,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Open url outside the app in an external browser.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class ExternalBrowserPatch : BytecodePatch(
     listOf(
         ExternalBrowserPrimaryFingerprint,
@@ -34,7 +30,7 @@ class ExternalBrowserPatch : BytecodePatch(
         ExternalBrowserTertiaryFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         arrayOf(
             ExternalBrowserPrimaryFingerprint,
@@ -54,7 +50,7 @@ class ExternalBrowserPatch : BytecodePatch(
                             """
                     )
                 }
-            } ?: return fingerprint.toErrorResult()
+            } ?: throw fingerprint.exception
         }
 
         /**
@@ -68,6 +64,5 @@ class ExternalBrowserPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-external-browser")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/forceopus/patch/ForceOpusCodecPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/forceopus/patch/ForceOpusCodecPatch.kt
index c33f9c9f4..d8d8584cb 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/forceopus/patch/ForceOpusCodecPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/forceopus/patch/ForceOpusCodecPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.misc.forceopus.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-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.patch.opus.AbstractOpusCodecsPatch
@@ -18,11 +15,10 @@ import app.revanced.util.integrations.Constants.MISC_PATH
 @Description("Forces the OPUS codec for audios.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class ForceOpusCodecPatch : AbstractOpusCodecsPatch(
     "$MISC_PATH/CodecOverridePatch;->shouldForceOpus()Z"
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         super.execute(context)
 
         /**
@@ -36,6 +32,5 @@ class ForceOpusCodecPatch : AbstractOpusCodecsPatch(
 
         SettingsPatch.updatePatchStatus("force-opus-codec")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/forcevp9/patch/ForceVP9CodecPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/forcevp9/patch/ForceVP9CodecPatch.kt
index 161a80ccb..a9cc37f38 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/forcevp9/patch/ForceVP9CodecPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/forcevp9/patch/ForceVP9CodecPatch.kt
@@ -1,9 +1,8 @@
 package app.revanced.patches.youtube.misc.forcevp9.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@@ -11,8 +10,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 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.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -36,7 +33,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 @Description("Forces the VP9 codec for videos.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class ForceVP9CodecPatch : BytecodePatch(
     listOf(
         LayoutSwitchFingerprint,
@@ -44,7 +40,7 @@ class ForceVP9CodecPatch : BytecodePatch(
         Vp9PropsParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         LayoutSwitchFingerprint.result?.classDef?.let { classDef ->
             arrayOf(
@@ -52,9 +48,9 @@ class ForceVP9CodecPatch : BytecodePatch(
                 Vp9SecondaryFingerprint
             ).forEach { fingerprint ->
                 fingerprint.also { it.resolve(context, classDef) }.result?.injectOverride()
-                    ?: return fingerprint.toErrorResult()
+                    ?: throw fingerprint.exception
             }
-        } ?: return LayoutSwitchFingerprint.toErrorResult()
+        } ?: throw LayoutSwitchFingerprint.exception
 
         Vp9PropsParentFingerprint.result?.let { parentResult ->
             Vp9PropsFingerprint.also {
@@ -70,8 +66,8 @@ class ForceVP9CodecPatch : BytecodePatch(
                 ).forEach { (fieldName, descriptor) ->
                     it.hookProps(fieldName, descriptor)
                 }
-            } ?: return Vp9PropsFingerprint.toErrorResult()
-        } ?: return Vp9PropsParentFingerprint.toErrorResult()
+            } ?: throw Vp9PropsFingerprint.exception
+        } ?: throw Vp9PropsParentFingerprint.exception
 
         VideoCapabilitiesParentFingerprint.result?.let { parentResult ->
             VideoCapabilitiesFingerprint.also {
@@ -96,8 +92,8 @@ class ForceVP9CodecPatch : BytecodePatch(
                             """
                     )
                 }
-            } ?: return VideoCapabilitiesFingerprint.toErrorResult()
-        } ?: return VideoCapabilitiesParentFingerprint.toErrorResult()
+            } ?: throw VideoCapabilitiesFingerprint.exception
+        } ?: throw VideoCapabilitiesParentFingerprint.exception
 
         /**
          * Add settings
@@ -110,7 +106,6 @@ class ForceVP9CodecPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("force-vp9-codec")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/language/patch/LanguageSelectorPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/language/patch/LanguageSelectorPatch.kt
index fc098aefa..93e358278 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/language/patch/LanguageSelectorPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/language/patch/LanguageSelectorPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.misc.language.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.language.fingerprints.GeneralPrefsFingerprint
@@ -22,11 +19,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Add language switch toggle.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class LanguageSelectorPatch : BytecodePatch(
     listOf(GeneralPrefsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         GeneralPrefsFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -38,10 +34,9 @@ class LanguageSelectorPatch : BytecodePatch(
                     "const/4 v$targetRegister, 0x1"
                 )
             }
-        } ?: return GeneralPrefsFingerprint.toErrorResult()
+        } ?: throw GeneralPrefsFingerprint.exception
 
         SettingsPatch.updatePatchStatus("language-switch")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/patch/LayoutSwitchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/patch/LayoutSwitchPatch.kt
index ed6f72899..c4e24d366 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/patch/LayoutSwitchPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/patch/LayoutSwitchPatch.kt
@@ -1,18 +1,14 @@
 package app.revanced.patches.youtube.misc.layoutswitch.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.addInstructionsWithLabels
 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
@@ -31,14 +27,13 @@ import com.android.tools.smali.dexlib2.Opcode
 @Description("Tricks the dpi to use some tablet/phone layouts.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class LayoutSwitchPatch : BytecodePatch(
     listOf(
         ClientFormFactorParentFingerprint,
         LayoutSwitchFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         fun MutableMethod.injectTabletLayout(jumpIndex: Int) {
             addInstructionsWithLabels(
@@ -73,16 +68,16 @@ class LayoutSwitchPatch : BytecodePatch(
 
                         injectTabletLayout(jumpIndex)
                     }
-                } ?: return ClientFormFactorWalkerFingerprint.toErrorResult()
+                } ?: throw ClientFormFactorWalkerFingerprint.exception
             }
-        } ?: return ClientFormFactorParentFingerprint.toErrorResult()
+        } ?: throw ClientFormFactorParentFingerprint.exception
 
         LayoutSwitchFingerprint.result?.mutableMethod?.addInstructions(
             4, """
                 invoke-static {p0}, $MISC_PATH/LayoutOverridePatch;->getLayoutOverride(I)I
                 move-result p0
                 """
-        ) ?: return LayoutSwitchFingerprint.toErrorResult()
+        ) ?: throw LayoutSwitchFingerprint.exception
 
         /**
          * Add settings
@@ -95,6 +90,5 @@ class LayoutSwitchPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("layout-switch")
 
-        return PatchResultSuccess()
     }
 }
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 a92c1f2aa..ca0caedac 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
@@ -1,16 +1,12 @@
 package app.revanced.patches.youtube.misc.minimizedplayback.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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
@@ -36,7 +32,6 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class MinimizedPlaybackPatch : BytecodePatch(
     listOf(
         KidsMinimizedPlaybackPolicyControllerFingerprint,
@@ -44,20 +39,19 @@ class MinimizedPlaybackPatch : BytecodePatch(
         MinimizedPlaybackSettingsFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val methods = arrayOf(
             KidsMinimizedPlaybackPolicyControllerFingerprint,
             MinimizedPlaybackManagerFingerprint,
             MinimizedPlaybackSettingsFingerprint
         ).map {
-            it.result?.mutableMethod ?: return it.toErrorResult()
+            it.result?.mutableMethod ?: throw it.exception
         }
 
         methods[0].hookKidsMiniPlayer()
         methods[1].hookMinimizedPlaybackManager()
         methods[2].hookMinimizedPlaybackSettings(context)
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/patch/OpenLinksDirectlyPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/patch/OpenLinksDirectlyPatch.kt
index a0b8cae96..929fa4dcf 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/patch/OpenLinksDirectlyPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/patch/OpenLinksDirectlyPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.misc.openlinksdirectly.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.misc.openlinksdirectly.fingerprints.OpenLinksDirectlyFingerprintPrimary
@@ -24,14 +21,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 @Description("Skips over redirection URLs to external links.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class OpenLinksDirectlyPatch : BytecodePatch(
     listOf(
         OpenLinksDirectlyFingerprintPrimary,
         OpenLinksDirectlyFingerprintSecondary
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         arrayOf(
             OpenLinksDirectlyFingerprintPrimary,
@@ -47,7 +43,7 @@ class OpenLinksDirectlyPatch : BytecodePatch(
                         "invoke-static {v$register}, $MISC_PATH/OpenLinksDirectlyPatch;->enableBypassRedirect(Ljava/lang/String;)Landroid/net/Uri;"
                     )
                 }
-            } ?: return fingerprint.toErrorResult()
+            } ?: throw fingerprint.exception
         }
 
         /**
@@ -61,6 +57,5 @@ class OpenLinksDirectlyPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-open-links-directly")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/quic/patch/QUICProtocolPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/quic/patch/QUICProtocolPatch.kt
index 4c7a718ea..6ed6e56c8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/quic/patch/QUICProtocolPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/quic/patch/QUICProtocolPatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.youtube.misc.quic.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.youtube.misc.quic.fingerprints.CronetEngineBuilderFingerprint
@@ -22,14 +19,13 @@ import app.revanced.util.integrations.Constants.MISC_PATH
 @Description("Disable CronetEngine's QUIC protocol.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class QUICProtocolPatch : BytecodePatch(
     listOf(
         CronetEngineBuilderFingerprint,
         ExperimentalCronetEngineBuilderFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         arrayOf(
             CronetEngineBuilderFingerprint,
@@ -40,7 +36,7 @@ class QUICProtocolPatch : BytecodePatch(
                     invoke-static {p1}, $MISC_PATH/QUICProtocolPatch;->disableQUICProtocol(Z)Z
                     move-result p1
                     """
-            ) ?: return it.toErrorResult()
+            ) ?: throw it.exception
         }
 
         /**
@@ -54,6 +50,5 @@ class QUICProtocolPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("disable-quic-protocol")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/patch/NewSplashAnimationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/patch/NewSplashAnimationPatch.kt
index 82c6b98fc..605a6931b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/patch/NewSplashAnimationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/patch/NewSplashAnimationPatch.kt
@@ -2,14 +2,11 @@ package app.revanced.patches.youtube.misc.splashanimation.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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
@@ -36,18 +33,17 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class NewSplashAnimationPatch : BytecodePatch(
     listOf(
         WatchWhileActivityWithInFlagsFingerprint,
         WatchWhileActivityWithOutFlagsFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         WatchWhileActivityWithInFlagsFingerprint.result
             ?: WatchWhileActivityWithOutFlagsFingerprint.result
-            ?: throw PatchResultError("Failed to resolve fingerprints")
+            ?: throw PatchException("Failed to resolve fingerprints")
 
         /**
          * ~YouTube v18.27.36
@@ -93,7 +89,6 @@ class NewSplashAnimationPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-new-splash-animation")
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/patch/SpoofAppVersionPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/patch/SpoofAppVersionPatch.kt
index 4f02b6e7b..5fb0d19ef 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/patch/SpoofAppVersionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/patch/SpoofAppVersionPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.misc.spoofappversion.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-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.patch.versionspoof.AbstractVersionSpoofPatch
@@ -20,11 +17,10 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode
 @Description("Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class SpoofAppVersionPatch : AbstractVersionSpoofPatch(
     "$MISC_PATH/VersionOverridePatch;->getVersionOverride(Ljava/lang/String;)Ljava/lang/String;"
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         super.execute(context)
 
         /**
@@ -43,6 +39,5 @@ class SpoofAppVersionPatch : AbstractVersionSpoofPatch(
 
         SettingsPatch.updatePatchStatus("spoof-app-version")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/translations/patch/TranslationsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/translations/patch/TranslationsPatch.kt
index f1393b59c..5733ff0f7 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/translations/patch/TranslationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/translations/patch/TranslationsPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.misc.translations.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.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
@@ -18,15 +15,13 @@ import app.revanced.util.resources.ResourceHelper.addTranslations
 @Description("Add Crowdin translations for YouTube.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class TranslationsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         context.addTranslations("youtube", LANGUAGE_LIST)
 
         SettingsPatch.updatePatchStatus("translations")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/patch/ChangeHomePagePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/patch/ChangeHomePagePatch.kt
index 4474c3e4e..07f0a4f01 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/patch/ChangeHomePagePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/patch/ChangeHomePagePatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.navigation.homepage.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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,14 +22,13 @@ import app.revanced.util.integrations.Constants.NAVIGATION
 @Description("Change home page to subscription feed.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class ChangeHomePagePatch : BytecodePatch(
     listOf(
         IntentExceptionFingerprint,
         LauncherActivityFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         LauncherActivityFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -43,7 +39,7 @@ class ChangeHomePagePatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return LauncherActivityFingerprint.toErrorResult()
+        } ?: throw LauncherActivityFingerprint.exception
 
         IntentExceptionFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -58,7 +54,7 @@ class ChangeHomePagePatch : BytecodePatch(
                         """, ExternalLabel("default", getInstruction(index))
                 )
             }
-        } ?: return IntentExceptionFingerprint.toErrorResult()
+        } ?: throw IntentExceptionFingerprint.exception
 
         /**
          * Add settings
@@ -72,6 +68,5 @@ class ChangeHomePagePatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("change-homepage")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/label/patch/NavigationLabelPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/label/patch/NavigationLabelPatch.kt
index f110690ff..2447fbd33 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/navigation/label/patch/NavigationLabelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/label/patch/NavigationLabelPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.navigation.label.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.navigation.label.fingerprints.PivotBarSetTextFingerprint
@@ -24,11 +21,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 @Description("Hide navigation bar labels.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class NavigationLabelPatch : BytecodePatch(
     listOf(PivotBarSetTextFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         PivotBarSetTextFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -38,14 +34,14 @@ class NavigationLabelPatch : BytecodePatch(
                 val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
 
                 if (targetReference != "Landroid/widget/TextView;")
-                    return PivotBarSetTextFingerprint.toErrorResult()
+                    throw PivotBarSetTextFingerprint.exception
 
                 addInstruction(
                     targetIndex + 1,
                     "invoke-static {v$targetRegister}, $NAVIGATION->hideNavigationLabel(Landroid/widget/TextView;)V"
                 )
             }
-        } ?: return PivotBarSetTextFingerprint.toErrorResult()
+        } ?: throw PivotBarSetTextFingerprint.exception
 
         /**
          * Add settings
@@ -59,6 +55,5 @@ class NavigationLabelPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-navigation-label")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/patch/NavigationButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/patch/NavigationButtonsPatch.kt
index 6ae6e2fc5..e6e2ca459 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/patch/NavigationButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/patch/NavigationButtonsPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.navigation.navigationbuttons.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.youtube.navigation.navigationbuttons.fingerprints.AutoMotiveFingerprint
@@ -36,14 +33,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class NavigationButtonsPatch : BytecodePatch(
     listOf(
         AutoMotiveFingerprint,
         PivotBarCreateButtonViewFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         PivotBarCreateButtonViewFingerprint.result?.let { parentResult ->
 
@@ -61,7 +57,7 @@ class NavigationButtonsPatch : BytecodePatch(
                         parentResult.mutableClass
                     )
                 }.map {
-                    it.result?.scanResult?.patternScanResult ?: return it.toErrorResult()
+                    it.result?.scanResult?.patternScanResult ?: throw it.exception
                 }
             ) {
                 val enumScanResult = this[0]
@@ -92,7 +88,7 @@ class NavigationButtonsPatch : BytecodePatch(
                 injectHook(createButtonHook, insertIndex)
             }
 
-        } ?: return PivotBarCreateButtonViewFingerprint.toErrorResult()
+        } ?: throw PivotBarCreateButtonViewFingerprint.exception
 
         /**
          * Switch create button with notifications button
@@ -109,7 +105,7 @@ class NavigationButtonsPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return AutoMotiveFingerprint.toErrorResult()
+        } ?: throw AutoMotiveFingerprint.exception
 
         /**
          * Add settings
@@ -123,7 +119,6 @@ class NavigationButtonsPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-navigation-buttons")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/patch/TabletNavigationBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/patch/TabletNavigationBarPatch.kt
index abbd2d55d..e2bd4da5b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/patch/TabletNavigationBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/patch/TabletNavigationBarPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.navigation.tabletnavbar.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 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.patches.youtube.navigation.tabletnavbar.fingerprints.PivotBarChangedFingerprint
@@ -25,20 +22,19 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Enables the tablet navigation bar.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class TabletNavigationBarPatch : BytecodePatch(
     listOf(
         PivotBarChangedFingerprint,
         PivotBarStyleFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         arrayOf(
             PivotBarChangedFingerprint,
             PivotBarStyleFingerprint
         ).forEach {
-            it.result?.insertHook() ?: return it.toErrorResult()
+            it.result?.insertHook() ?: throw it.exception
         }
 
         /**
@@ -53,7 +49,6 @@ class TabletNavigationBarPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-tablet-navigation-bar")
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/patch/AlwaysRepeatPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/patch/AlwaysRepeatPatch.kt
index be0e50465..93bd45aa6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/patch/AlwaysRepeatPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/alwaysrepeat/patch/AlwaysRepeatPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.overlaybutton.alwaysrepeat.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.addInstructionsWithLabels
 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.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.overlaybutton.alwaysrepeat.fingerprints.AutoNavInformerFingerprint
@@ -25,7 +22,7 @@ class AlwaysRepeatPatch : BytecodePatch(
         VideoEndParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         VideoEndParentFingerprint.result?.classDef?.let { classDef ->
             VideoEndFingerprint.also { it.resolve(context, classDef) }.result?.let {
                 it.mutableMethod.apply {
@@ -38,8 +35,8 @@ class AlwaysRepeatPatch : BytecodePatch(
                             """, ExternalLabel("end", getInstruction(0))
                     )
                 }
-            } ?: return VideoEndFingerprint.toErrorResult()
-        } ?: return VideoEndParentFingerprint.toErrorResult()
+            } ?: throw VideoEndFingerprint.exception
+        } ?: throw VideoEndParentFingerprint.exception
 
         AutoNavInformerFingerprint.result?.let {
             with(
@@ -58,8 +55,7 @@ class AlwaysRepeatPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return AutoNavInformerFingerprint.toErrorResult()
+        } ?: throw AutoNavInformerFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/downloadbuttonhook/patch/DownloadButtonHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/downloadbuttonhook/patch/DownloadButtonHookPatch.kt
index 008276382..1d6c29b2e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/downloadbuttonhook/patch/DownloadButtonHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/downloadbuttonhook/patch/DownloadButtonHookPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.overlaybutton.downloadbuttonhook.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.util.smali.ExternalLabel
 import app.revanced.patches.youtube.overlaybutton.downloadbuttonhook.fingerprints.DownloadActionsFingerprint
 import app.revanced.util.integrations.Constants.UTILS_PATH
@@ -14,7 +12,7 @@ import app.revanced.util.integrations.Constants.UTILS_PATH
 class DownloadButtonHookPatch : BytecodePatch(
     listOf(DownloadActionsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         DownloadActionsFingerprint.result?.let {
             it.mutableMethod.apply {
                 val targetIndex = it.scanResult.patternScanResult!!.startIndex
@@ -29,8 +27,7 @@ class DownloadButtonHookPatch : BytecodePatch(
                         """, ExternalLabel("default", getInstruction(targetIndex))
                 )
             }
-        } ?: return DownloadActionsFingerprint.toErrorResult()
+        } ?: throw DownloadActionsFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/patch/OverlayButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/patch/OverlayButtonsPatch.kt
index 09d15eae6..f4d438e04 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/patch/OverlayButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/patch/OverlayButtonsPatch.kt
@@ -3,10 +3,7 @@ package app.revanced.patches.youtube.overlaybutton.general.patch
 import app.revanced.extensions.doRecursively
 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.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
@@ -41,9 +38,8 @@ import org.w3c.dom.Element
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class OverlayButtonsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         /**
          * Inject hook
@@ -161,6 +157,5 @@ class OverlayButtonsPatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("overlay-buttons")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt
index fbdb0f480..891f8cec5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/patch/HideAutoplayButtonPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.player.autoplaybutton.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -34,11 +31,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideAutoplayButtonPatch : BytecodePatch(
     listOf(LayoutConstructorFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         LayoutConstructorFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -55,7 +51,7 @@ class HideAutoplayButtonPatch : BytecodePatch(
                         """, ExternalLabel("hidden", getInstruction(jumpIndex))
                 )
             }
-        } ?: return LayoutConstructorFingerprint.toErrorResult()
+        } ?: throw LayoutConstructorFingerprint.exception
 
         /**
          * Add settings
@@ -69,7 +65,6 @@ class HideAutoplayButtonPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-autoplay-button")
 
-        return PatchResultSuccess()
     }
 }
 
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/patch/HideCaptionsButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/patch/HideCaptionsButtonPatch.kt
index c3990fda3..16bf9de64 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/patch/HideCaptionsButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/patch/HideCaptionsButtonPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.player.captionsbutton.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.utils.annotations.YouTubeCompatibility
@@ -30,11 +27,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideCaptionsButtonBytecodePatch : BytecodePatch(
     listOf(SubtitleButtonControllerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SubtitleButtonControllerFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -52,7 +48,7 @@ class HideCaptionsButtonBytecodePatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $PLAYER->hideCaptionsButton(Landroid/widget/ImageView;)V"
                 )
             }
-        } ?: return SubtitleButtonControllerFingerprint.toErrorResult()
+        } ?: throw SubtitleButtonControllerFingerprint.exception
 
         /**
          * Add settings
@@ -66,6 +62,5 @@ class HideCaptionsButtonBytecodePatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-captions-button")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/patch/HideCastButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/patch/HideCastButtonPatch.kt
index 538b3d093..6f0186d5d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/patch/HideCastButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/patch/HideCastButtonPatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.youtube.player.castbutton.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.youtube.player.castbutton.fingerprints.CastButtonFingerprint
@@ -21,11 +18,10 @@ import app.revanced.util.integrations.Constants.PLAYER
 @Description("Hides the cast button in the video player.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideCastButtonPatch : BytecodePatch(
     listOf(CastButtonFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         CastButtonFingerprint.result?.let {
             it.mutableMethod.apply {
                 addInstructions(
@@ -35,7 +31,7 @@ class HideCastButtonPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return CastButtonFingerprint.toErrorResult()
+        } ?: throw CastButtonFingerprint.exception
 
         /**
          * Add settings
@@ -49,6 +45,5 @@ class HideCastButtonPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-cast-button")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/patch/HideCollapseButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/patch/HideCollapseButtonPatch.kt
index 9a5a30237..d375d19bf 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/patch/HideCollapseButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/patch/HideCollapseButtonPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.player.collapsebutton.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.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
@@ -23,9 +20,8 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideCollapseButtonPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         /**
          * Add settings
@@ -39,6 +35,5 @@ class HideCollapseButtonPatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("hide-collapse-button")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/patch/HideEndScreenCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/patch/HideEndScreenCardsPatch.kt
index 8acdfa5a4..28c4fc424 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/patch/HideEndScreenCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/patch/HideEndScreenCardsPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.player.endscreencards.patch
 
+import app.revanced.extensions.exception
 import app.revanced.extensions.injectHideCall
-import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 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.patches.youtube.player.endscreencards.fingerprints.LayoutCircleFingerprint
@@ -31,7 +28,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideEndScreenCardsPatch : BytecodePatch(
     listOf(
         LayoutCircleFingerprint,
@@ -39,7 +35,7 @@ class HideEndScreenCardsPatch : BytecodePatch(
         LayoutVideoFingerprint,
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         fun MethodFingerprintResult.injectHideCalls() {
             val index = scanResult.patternScanResult!!.endIndex
@@ -59,7 +55,7 @@ class HideEndScreenCardsPatch : BytecodePatch(
             LayoutIconFingerprint,
             LayoutVideoFingerprint
         ).forEach {
-            it.result?.injectHideCalls() ?: return it.toErrorResult()
+            it.result?.injectHideCalls() ?: throw it.exception
         }
 
         /**
@@ -74,6 +70,5 @@ class HideEndScreenCardsPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-endscreen-cards")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/patch/HideFilmstripOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/patch/HideFilmstripOverlayPatch.kt
index 6cace546b..075574afc 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/patch/HideFilmstripOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/patch/HideFilmstripOverlayPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.player.filmstripoverlay.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 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
@@ -42,14 +39,13 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideFilmstripOverlayPatch : BytecodePatch(
     listOf(
         FilmStripOverlayParentFingerprint,
         YouTubeControlsOverlayFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         FilmStripOverlayParentFingerprint.result?.classDef?.let { classDef ->
             arrayOf(
@@ -63,9 +59,9 @@ class HideFilmstripOverlayPatch : BytecodePatch(
                         classDef
                     )
                 }.result?.mutableMethod?.injectHook()
-                    ?: return fingerprint.toErrorResult()
+                    ?: throw fingerprint.exception
             }
-        } ?: return FilmStripOverlayParentFingerprint.toErrorResult()
+        } ?: throw FilmStripOverlayParentFingerprint.exception
 
         YouTubeControlsOverlayFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -137,7 +133,7 @@ class HideFilmstripOverlayPatch : BytecodePatch(
                         """, ExternalLabel("hidden", getInstruction(jumpIndex))
                 )
             }
-        } ?: return YouTubeControlsOverlayFingerprint.toErrorResult()
+        } ?: throw YouTubeControlsOverlayFingerprint.exception
 
         /**
          * Add settings
@@ -152,7 +148,6 @@ class HideFilmstripOverlayPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-filmstrip-overlay")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/patch/HapticFeedBackPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/patch/HapticFeedBackPatch.kt
index f395774bb..03352f3d8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/patch/HapticFeedBackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/patch/HapticFeedBackPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.player.hapticfeedback.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 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.patcher.util.proxy.mutableTypes.MutableMethod
@@ -29,7 +26,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Disable haptic feedback when swiping.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class HapticFeedBackPatch : BytecodePatch(
     listOf(
         MarkerHapticsFingerprint,
@@ -38,7 +34,7 @@ class HapticFeedBackPatch : BytecodePatch(
         ZoomHapticsFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         arrayOf(
             SeekHapticsFingerprint to "disableSeekVibrate",
@@ -59,7 +55,6 @@ class HapticFeedBackPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("disable-haptic-feedback")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
@@ -76,7 +71,7 @@ class HapticFeedBackPatch : BytecodePatch(
 
                     injectHook(index, register, methodName)
                 }
-            } ?: throw toErrorResult()
+            } ?: throw exception
         }
 
         fun MutableMethod.injectHook(
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/infocards/patch/HideInfoCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/infocards/patch/HideInfoCardsPatch.kt
index db8ae4292..ff9ce845b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/infocards/patch/HideInfoCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/infocards/patch/HideInfoCardsPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.player.infocards.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.player.infocards.fingerprints.InfoCardsIncognitoFingerprint
@@ -23,11 +20,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 @Description("Hides info-cards in videos.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideInfoCardsPatch : BytecodePatch(
     listOf(InfoCardsIncognitoFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         InfoCardsIncognitoFingerprint.result?.let {
             it.mutableMethod.apply {
                 val targetIndex = it.scanResult.patternScanResult!!.startIndex
@@ -41,7 +37,7 @@ class HideInfoCardsPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return InfoCardsIncognitoFingerprint.toErrorResult()
+        } ?: throw InfoCardsIncognitoFingerprint.exception
 
         /**
          * Add settings
@@ -55,6 +51,5 @@ class HideInfoCardsPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-info-cards")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/patch/HideMusicButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/patch/HideMusicButtonPatch.kt
index 2b3219900..031c7c06e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/patch/HideMusicButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/patch/HideMusicButtonPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.player.musicbutton.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -29,11 +26,10 @@ import app.revanced.util.integrations.Constants.PLAYER
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideMusicButtonPatch : BytecodePatch(
     listOf(MusicAppDeeplinkButtonFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         MusicAppDeeplinkButtonFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -47,7 +43,7 @@ class HideMusicButtonPatch : BytecodePatch(
                     ExternalLabel("hidden", getInstruction(implementation!!.instructions.size - 1))
                 )
             }
-        } ?: return MusicAppDeeplinkButtonFingerprint.toErrorResult()
+        } ?: throw MusicAppDeeplinkButtonFingerprint.exception
 
         /**
          * Add settings
@@ -61,6 +57,5 @@ class HideMusicButtonPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-music-button")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt
index b8683b87c..88fa563d9 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/patch/HidePlayerButtonBackgroundPatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.youtube.player.playerbuttonbg.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.youtube.player.playerbuttonbg.fingerprints.PlayerPatchFingerprint
@@ -27,18 +24,17 @@ import app.revanced.util.integrations.Constants.INTEGRATIONS_PATH
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HidePlayerButtonBackgroundPatch : BytecodePatch(
     listOf(PlayerPatchFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         PlayerPatchFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "invoke-static {p0}, " +
                     "$INTEGRATIONS_PATH/utils/ResourceHelper;->" +
                     "hidePlayerButtonBackground(Landroid/view/View;)V"
-        ) ?: return PlayerPatchFingerprint.toErrorResult()
+        ) ?: throw PlayerPatchFingerprint.exception
 
         /**
          * Add settings
@@ -52,6 +48,5 @@ class HidePlayerButtonBackgroundPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-player-button-background")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt
index 706f098ff..d6be4fc80 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlayfilter/patch/PlayerOverlayFilterPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.player.playeroverlayfilter.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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.utils.annotations.YouTubeCompatibility
@@ -33,11 +30,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class PlayerOverlayFilterPatch : BytecodePatch(
     listOf(YouTubeControlsOverlayFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         YouTubeControlsOverlayFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -46,14 +42,14 @@ class PlayerOverlayFilterPatch : BytecodePatch(
                 val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
 
                 if (!targetParameter.toString().endsWith("Landroid/widget/ImageView;"))
-                    return PatchResultError("Method signature parameter did not match: $targetParameter")
+                    throw PatchException("Method signature parameter did not match: $targetParameter")
 
                 addInstruction(
                     targetIndex + 1,
                     "invoke-static {v$targetRegister}, $PLAYER->hidePlayerOverlayFilter(Landroid/widget/ImageView;)V"
                 )
             }
-        } ?: return YouTubeControlsOverlayFingerprint.toErrorResult()
+        } ?: throw YouTubeControlsOverlayFingerprint.exception
 
         /**
          * Add settings
@@ -67,6 +63,5 @@ class PlayerOverlayFilterPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-player-overlay-filter")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/patch/HidePreviousNextButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/patch/HidePreviousNextButtonPatch.kt
index e4a080925..041dab29b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/patch/HidePreviousNextButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/patch/HidePreviousNextButtonPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.youtube.player.previousnextbutton.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.utils.annotations.YouTubeCompatibility
@@ -23,9 +20,8 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HidePreviousNextButtonPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         /**
          * Add settings
@@ -39,6 +35,5 @@ class HidePreviousNextButtonPatch : BytecodePatch() {
 
         SettingsPatch.updatePatchStatus("hide-previous-next-button")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/patch/SeekMessagePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/patch/SeekMessagePatch.kt
index 0a17e74bd..537620e2e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/patch/SeekMessagePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/patch/SeekMessagePatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.player.seekmessage.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -29,11 +26,10 @@ import app.revanced.util.integrations.Constants.PLAYER
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class SeekMessagePatch : BytecodePatch(
     listOf(SeekEduContainerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SeekEduContainerFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -46,7 +42,7 @@ class SeekMessagePatch : BytecodePatch(
                         """, ExternalLabel("default", getInstruction(0))
                 )
             }
-        } ?: return SeekEduContainerFingerprint.toErrorResult()
+        } ?: throw SeekEduContainerFingerprint.exception
 
         /**
          * Add settings
@@ -60,6 +56,5 @@ class SeekMessagePatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-seek-message")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/patch/HideSpeedOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/patch/HideSpeedOverlayPatch.kt
index be757600a..7b0374698 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/patch/HideSpeedOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/patch/HideSpeedOverlayPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.player.speedoverlay.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.player.speedoverlay.fingerprints.SpeedOverlayConfigFingerprint
@@ -23,11 +20,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Hide speed overlay in player.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideSpeedOverlayPatch : BytecodePatch(
     listOf(SpeedOverlayConfigFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SpeedOverlayConfigFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -41,7 +37,7 @@ class HideSpeedOverlayPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return SpeedOverlayConfigFingerprint.toErrorResult()
+        } ?: throw SpeedOverlayConfigFingerprint.exception
 
         /**
          * Add settings
@@ -55,6 +51,5 @@ class HideSpeedOverlayPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-speed-overlay")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/patch/SuggestedActionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/patch/SuggestedActionsPatch.kt
index 5d2ed4489..68fc297db 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/patch/SuggestedActionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/patch/SuggestedActionsPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.player.suggestactions.patch
 
+import app.revanced.extensions.exception
 import app.revanced.extensions.injectHideCall
-import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.player.suggestactions.fingerprints.SuggestedActionsFingerprint
@@ -31,11 +28,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class SuggestedActionsPatch : BytecodePatch(
     listOf(SuggestedActionsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SuggestedActionsFingerprint.result?.let {
             it.mutableMethod.apply {
                 val targetIndex = it.scanResult.patternScanResult!!.endIndex
@@ -48,7 +44,7 @@ class SuggestedActionsPatch : BytecodePatch(
                     "hideSuggestedActions"
                 )
             }
-        } ?: return SuggestedActionsFingerprint.toErrorResult()
+        } ?: throw SuggestedActionsFingerprint.exception
 
         context.updatePatchStatus("SuggestedActions")
 
@@ -64,6 +60,5 @@ class SuggestedActionsPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-suggested-actions")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/patch/SuggestedVideoOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/patch/SuggestedVideoOverlayPatch.kt
index 6a6ca948d..7d60dcfe6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/patch/SuggestedVideoOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/patch/SuggestedVideoOverlayPatch.kt
@@ -1,17 +1,14 @@
 package app.revanced.patches.youtube.player.suggestedvideooverlay.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.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.player.suggestedvideooverlay.fingerprints.CoreConatinerBuilderFingerprint
@@ -36,14 +33,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class SuggestedVideoOverlayPatch : BytecodePatch(
     listOf(
         CoreConatinerBuilderFingerprint,
         VideoEndParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         CoreConatinerBuilderFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -52,7 +48,7 @@ class SuggestedVideoOverlayPatch : BytecodePatch(
                     getInstruction<ReferenceInstruction>(targetIndex).reference
 
                 if (!targetReference.toString().endsWith("Landroid/view/ViewGroup;"))
-                    return PatchResultError("Reference did not match: $targetReference")
+                    throw PatchException("Reference did not match: $targetReference")
 
                 val targetRegister =
                     getInstruction<TwoRegisterInstruction>(targetIndex).registerA
@@ -62,7 +58,7 @@ class SuggestedVideoOverlayPatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $PLAYER->hideSuggestedVideoOverlay(Landroid/view/ViewGroup;)V"
                 )
             }
-        } ?: return CoreConatinerBuilderFingerprint.toErrorResult()
+        } ?: throw CoreConatinerBuilderFingerprint.exception
 
         VideoEndParentFingerprint.result?.classDef?.let { classDef ->
             VideoEndFingerprint.also { it.resolve(context, classDef) }.result?.let {
@@ -72,8 +68,8 @@ class SuggestedVideoOverlayPatch : BytecodePatch(
                         "invoke-static {},$PLAYER->hideSuggestedVideoOverlay()V"
                     )
                 }
-            } ?: return VideoEndFingerprint.toErrorResult()
-        } ?: return VideoEndParentFingerprint.toErrorResult()
+            } ?: throw VideoEndFingerprint.exception
+        } ?: throw VideoEndParentFingerprint.exception
 
         /**
          * Add settings
@@ -88,7 +84,6 @@ class SuggestedVideoOverlayPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-suggested-video-overlay")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/watermark/patch/HideChannelWatermarkPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/watermark/patch/HideChannelWatermarkPatch.kt
index a1bc2c38c..47d0017e1 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/player/watermark/patch/HideChannelWatermarkPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/player/watermark/patch/HideChannelWatermarkPatch.kt
@@ -1,17 +1,14 @@
 package app.revanced.patches.youtube.player.watermark.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.player.watermark.fingerprints.HideWatermarkFingerprint
@@ -26,11 +23,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 @Description("Hides creator's watermarks on videos.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideChannelWatermarkBytecodePatch : BytecodePatch(
     listOf(HideWatermarkParentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         HideWatermarkParentFingerprint.result?.let { parentResult ->
             HideWatermarkFingerprint.also {
@@ -51,8 +47,8 @@ class HideChannelWatermarkBytecodePatch : BytecodePatch(
                             """
                     )
                 }
-            } ?: return HideWatermarkFingerprint.toErrorResult()
-        } ?: return HideWatermarkParentFingerprint.toErrorResult()
+            } ?: throw HideWatermarkFingerprint.exception
+        } ?: throw HideWatermarkParentFingerprint.exception
 
         /**
          * Add settings
@@ -66,6 +62,5 @@ class HideChannelWatermarkBytecodePatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-channel-watermark")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbar/patch/HideSeekbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbar/patch/HideSeekbarPatch.kt
index 4428edbdf..64f9c7d99 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbar/patch/HideSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbar/patch/HideSeekbarPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.seekbar.seekbar.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 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
@@ -31,11 +28,10 @@ import app.revanced.util.integrations.Constants.SEEKBAR
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideSeekbarPatch : BytecodePatch(
     listOf(SeekbarFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SeekbarFingerprint.result?.mutableClass?.let { mutableClass ->
             SeekbarOnDrawFingerprint.also { it.resolve(context, mutableClass) }.result?.let {
@@ -49,8 +45,8 @@ class HideSeekbarPatch : BytecodePatch(
                             """, ExternalLabel("show_seekbar", getInstruction(0))
                     )
                 }
-            } ?: return SeekbarOnDrawFingerprint.toErrorResult()
-        } ?: return SeekbarFingerprint.toErrorResult()
+            } ?: throw SeekbarOnDrawFingerprint.exception
+        } ?: throw SeekbarFingerprint.exception
 
         /**
          * Add settings
@@ -65,6 +61,5 @@ class HideSeekbarPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-seekbar")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt
index f56edc8f6..5033fff9d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/seekbarcolor/patch/SeekbarColorPatch.kt
@@ -1,17 +1,13 @@
 package app.revanced.patches.youtube.seekbar.seekbarcolor.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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 +39,6 @@ import org.w3c.dom.Element
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class SeekbarColorPatch : BytecodePatch(
     listOf(
         ControlsOverlayStyleFingerprint,
@@ -51,15 +46,15 @@ class SeekbarColorPatch : BytecodePatch(
         ShortsSeekbarColorFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         PlayerSeekbarColorFingerprint.result?.mutableMethod?.apply {
             hook(getWideLiteralIndex(InlineTimeBarColorizedBarPlayedColorDark) + 2)
             hook(getWideLiteralIndex(InlineTimeBarPlayedNotHighlightedColor) + 2)
-        } ?: return PlayerSeekbarColorFingerprint.toErrorResult()
+        } ?: throw PlayerSeekbarColorFingerprint.exception
 
         ShortsSeekbarColorFingerprint.result?.mutableMethod?.apply {
             hook(getWideLiteralIndex(ReelTimeBarPlayedColor) + 2)
-        } ?: return ShortsSeekbarColorFingerprint.toErrorResult()
+        } ?: throw ShortsSeekbarColorFingerprint.exception
 
         ControlsOverlayStyleFingerprint.result?.let {
             with(
@@ -77,7 +72,7 @@ class SeekbarColorPatch : BytecodePatch(
                     """
                 )
             }
-        } ?: return ControlsOverlayStyleFingerprint.toErrorResult()
+        } ?: throw ControlsOverlayStyleFingerprint.exception
 
         LithoThemePatch.injectCall("$SEEKBAR->getLithoColor(I)I")
 
@@ -85,7 +80,7 @@ class SeekbarColorPatch : BytecodePatch(
             val layerList = it.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
@@ -107,7 +102,6 @@ class SeekbarColorPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("custom-seekbar-color")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/speed/patch/AppendSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/speed/patch/AppendSpeedPatch.kt
index d6af66922..d67a07117 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/speed/patch/AppendSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/speed/patch/AppendSpeedPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.seekbar.speed.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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.utils.annotations.YouTubeCompatibility
@@ -34,11 +31,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class AppendSpeedPatch : BytecodePatch(
     listOf(TotalTimeFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         TotalTimeFingerprint.result?.let {
             it.mutableMethod.apply {
                 var insertIndex = -1
@@ -62,9 +58,9 @@ class AppendSpeedPatch : BytecodePatch(
                     }
                 }
                 if (insertIndex == -1)
-                    return PatchResultError("target Instruction not found!")
+                    throw PatchException("target Instruction not found!")
             }
-        } ?: return TotalTimeFingerprint.toErrorResult()
+        } ?: throw TotalTimeFingerprint.exception
 
         /**
          * Add settings
@@ -78,6 +74,5 @@ class AppendSpeedPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-timestamps-speed")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/patch/SeekbarTappingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/patch/SeekbarTappingPatch.kt
index 68ae9ad31..7de4cc12f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/patch/SeekbarTappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/patch/SeekbarTappingPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.seekbar.tapping.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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,14 +22,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 @Description("Enables tap-to-seek on the seekbar of the video player.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class SeekbarTappingPatch : BytecodePatch(
     listOf(
         SeekbarTappingReferenceFingerprint,
         SeekbarTappingFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SeekbarTappingReferenceFingerprint.result?.let {
             it.mutableMethod.apply {
                 TappingLabel = """
@@ -43,7 +39,7 @@ class SeekbarTappingPatch : BytecodePatch(
                     invoke-virtual { p0, v2 }, ${getInstruction<ReferenceInstruction>(it.scanResult.patternScanResult!!.endIndex - 1).reference}
                     """
             }
-        } ?: return SeekbarTappingReferenceFingerprint.toErrorResult()
+        } ?: throw SeekbarTappingReferenceFingerprint.exception
 
         SeekbarTappingFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -55,7 +51,7 @@ class SeekbarTappingPatch : BytecodePatch(
                     ExternalLabel("disabled", getInstruction(insertIndex))
                 )
             }
-        } ?: return SeekbarTappingFingerprint.toErrorResult()
+        } ?: throw SeekbarTappingFingerprint.exception
 
         /**
          * Add settings
@@ -69,7 +65,6 @@ class SeekbarTappingPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-seekbar-tapping")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/patch/NewThumbnailPreviewPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/patch/NewThumbnailPreviewPatch.kt
index 764b50527..8d6252ef9 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/patch/NewThumbnailPreviewPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/patch/NewThumbnailPreviewPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.seekbar.thumbnailpreview.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.seekbar.thumbnailpreview.fingerprints.ThumbnailPreviewConfigFingerprint
@@ -23,11 +20,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Enables a new type of thumbnail preview.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class NewThumbnailPreviewPatch : BytecodePatch(
     listOf(ThumbnailPreviewConfigFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         ThumbnailPreviewConfigFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -41,7 +37,7 @@ class NewThumbnailPreviewPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return ThumbnailPreviewConfigFingerprint.toErrorResult()
+        } ?: throw ThumbnailPreviewConfigFingerprint.exception
 
         /**
          * Add settings
@@ -55,6 +51,5 @@ class NewThumbnailPreviewPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-new-thumbnail-preview")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/patch/HideTimeStampPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/patch/HideTimeStampPatch.kt
index 69ed137ee..6810df794 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/patch/HideTimeStampPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/patch/HideTimeStampPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.seekbar.timestamps.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -23,11 +20,10 @@ import app.revanced.util.integrations.Constants.SEEKBAR
 @Description("Hides timestamp in video player.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class HideTimeStampPatch : BytecodePatch(
     listOf(TimeCounterFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         TimeCounterFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -40,7 +36,7 @@ class HideTimeStampPatch : BytecodePatch(
                         """, ExternalLabel("show_time_stamp", getInstruction(0))
                 )
             }
-        } ?: return TimeCounterFingerprint.toErrorResult()
+        } ?: throw TimeCounterFingerprint.exception
 
         /**
          * Add settings
@@ -54,6 +50,5 @@ class HideTimeStampPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("hide-time-stamp")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/commentpopuppanels/patch/NewCommentPopupPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/commentpopuppanels/patch/NewCommentPopupPanelsPatch.kt
index 570d8938e..a06c5f952 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/commentpopuppanels/patch/NewCommentPopupPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/commentpopuppanels/patch/NewCommentPopupPanelsPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.shorts.commentpopuppanels.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.shorts.commentpopuppanels.fingerprints.ReelWatchFragmentBuilderFingerprint
@@ -24,11 +21,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Enables a new type of comment popup panel in the shorts player.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class NewCommentPopupPanelsPatch : BytecodePatch(
     listOf(ReelWatchFragmentBuilderFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         ReelWatchFragmentBuilderFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -42,7 +38,7 @@ class NewCommentPopupPanelsPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return ReelWatchFragmentBuilderFingerprint.toErrorResult()
+        } ?: throw ReelWatchFragmentBuilderFingerprint.exception
 
         /**
          * Add settings
@@ -55,6 +51,5 @@ class NewCommentPopupPanelsPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("enable-new-comment-popup-panels")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsCommentButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsCommentButtonPatch.kt
index 5e9fa3346..c6015f3d6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsCommentButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsCommentButtonPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.shorts.shortscomponent.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.youtube.shorts.shortscomponent.fingerprints.ShortsCommentFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.RightComment
 import app.revanced.util.bytecode.getWideLiteralIndex
@@ -16,7 +14,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ShortsCommentButtonPatch : BytecodePatch(
     listOf(ShortsCommentFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShortsCommentFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = getWideLiteralIndex(RightComment) + 3
@@ -27,8 +25,7 @@ class ShortsCommentButtonPatch : BytecodePatch(
                     "invoke-static {v$insertRegister}, $SHORTS->hideShortsPlayerCommentsButton(Landroid/view/View;)V"
                 )
             }
-        } ?: return ShortsCommentFingerprint.toErrorResult()
+        } ?: throw ShortsCommentFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsComponentPatch.kt
index 2bc84f4e2..bb2fcaf25 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsComponentPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsComponentPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.youtube.shorts.shortscomponent.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.shorts.shortsnavigationbar.patch.ShortsNavigationBarPatch
@@ -39,9 +36,8 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class ShortsComponentPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/ShortsFilter;")
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/ShortsHeaderFilter;")
@@ -60,6 +56,5 @@ class ShortsComponentPatch : BytecodePatch() {
 
         SettingsPatch.updatePatchStatus("hide-shorts-component")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsDislikeButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsDislikeButtonPatch.kt
index d47689f18..c439f369b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsDislikeButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsDislikeButtonPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.shorts.shortscomponent.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.util.smali.ExternalLabel
 import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.ShortsDislikeFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.ReelRightDislikeIcon
@@ -18,7 +16,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ShortsDislikeButtonPatch : BytecodePatch(
     listOf(ShortsDislikeFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShortsDislikeFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = getWideLiteralIndex(ReelRightDislikeIcon)
@@ -38,8 +36,7 @@ class ShortsDislikeButtonPatch : BytecodePatch(
                     break
                 }
             }
-        } ?: return ShortsDislikeFingerprint.toErrorResult()
+        } ?: throw ShortsDislikeFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsInfoPanelPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsInfoPanelPatch.kt
index e70815a44..f4516c384 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsInfoPanelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsInfoPanelPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.shorts.shortscomponent.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.patches.youtube.shorts.shortscomponent.fingerprints.ShortsInfoPanelFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.ReelPlayerInfoPanel
 import app.revanced.util.bytecode.getWideLiteralIndex
@@ -16,7 +14,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ShortsInfoPanelPatch : BytecodePatch(
     listOf(ShortsInfoPanelFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShortsInfoPanelFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = getWideLiteralIndex(ReelPlayerInfoPanel) + 3
@@ -29,8 +27,7 @@ class ShortsInfoPanelPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return ShortsInfoPanelFingerprint.toErrorResult()
+        } ?: throw ShortsInfoPanelFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsLikeButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsLikeButtonPatch.kt
index 99596c655..b27447f4e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsLikeButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsLikeButtonPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.shorts.shortscomponent.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.util.smali.ExternalLabel
 import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.ShortsLikeFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.ReelRightLikeIcon
@@ -18,7 +16,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ShortsLikeButtonPatch : BytecodePatch(
     listOf(ShortsLikeFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShortsLikeFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = getWideLiteralIndex(ReelRightLikeIcon)
@@ -38,8 +36,7 @@ class ShortsLikeButtonPatch : BytecodePatch(
                     break
                 }
             }
-        } ?: return ShortsLikeFingerprint.toErrorResult()
+        } ?: throw ShortsLikeFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsPaidPromotionBannerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsPaidPromotionBannerPatch.kt
index e17aa075f..0a7f27bab 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsPaidPromotionBannerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsPaidPromotionBannerPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.shorts.shortscomponent.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.ShortsPaidPromotionFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.ReelPlayerBadge
@@ -18,7 +16,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ShortsPaidPromotionBannerPatch : BytecodePatch(
     listOf(ShortsPaidPromotionFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShortsPaidPromotionFingerprint.result?.let {
             it.mutableMethod.apply {
                 val primaryIndex = getWideLiteralIndex(ReelPlayerBadge) + 3
@@ -32,9 +30,8 @@ class ShortsPaidPromotionBannerPatch : BytecodePatch(
                     insertHook(primaryIndex)
                 }
             }
-        } ?: return ShortsPaidPromotionFingerprint.toErrorResult()
+        } ?: throw ShortsPaidPromotionFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsRemixButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsRemixButtonPatch.kt
index 2ad4f30a8..517cd01e4 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsRemixButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsRemixButtonPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.shorts.shortscomponent.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.youtube.shorts.shortscomponent.fingerprints.ShortsRemixFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.ReelDynRemix
 import app.revanced.util.bytecode.getWideLiteralIndex
@@ -16,7 +14,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ShortsRemixButtonPatch : BytecodePatch(
     listOf(ShortsRemixFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShortsRemixFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = getWideLiteralIndex(ReelDynRemix) - 2
@@ -28,8 +26,7 @@ class ShortsRemixButtonPatch : BytecodePatch(
                 )
 
             }
-        } ?: return ShortsRemixFingerprint.toErrorResult()
+        } ?: throw ShortsRemixFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsShareButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsShareButtonPatch.kt
index 0ddd76c56..381ce3ebb 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsShareButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsShareButtonPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.shorts.shortscomponent.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.youtube.shorts.shortscomponent.fingerprints.ShortsShareFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.ReelDynShare
 import app.revanced.util.bytecode.getWideLiteralIndex
@@ -16,7 +14,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ShortsShareButtonPatch : BytecodePatch(
     listOf(ShortsShareFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShortsShareFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = getWideLiteralIndex(ReelDynShare) - 2
@@ -28,8 +26,7 @@ class ShortsShareButtonPatch : BytecodePatch(
                 )
 
             }
-        } ?: return ShortsShareFingerprint.toErrorResult()
+        } ?: throw ShortsShareFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsSubscriptionsButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsSubscriptionsButtonPatch.kt
index c4a7d4587..ff7c5edd5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsSubscriptionsButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsSubscriptionsButtonPatch.kt
@@ -1,14 +1,12 @@
 package app.revanced.patches.youtube.shorts.shortscomponent.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.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.patches.youtube.shorts.shortscomponent.fingerprints.ShortsSubscriptionsFingerprint
 import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.ShortsSubscriptionsTabletFingerprint
 import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.ShortsSubscriptionsTabletParentFingerprint
@@ -28,7 +26,7 @@ class ShortsSubscriptionsButtonPatch : BytecodePatch(
         ShortsSubscriptionsTabletParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShortsSubscriptionsFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = getWideLiteralIndex(ReelPlayerPausedStateButton) + 2
@@ -39,7 +37,7 @@ class ShortsSubscriptionsButtonPatch : BytecodePatch(
                     "invoke-static {v$insertRegister}, $SHORTS->hideShortsPlayerSubscriptionsButton(Landroid/view/View;)V"
                 )
             }
-        } ?: return ShortsSubscriptionsFingerprint.toErrorResult()
+        } ?: throw ShortsSubscriptionsFingerprint.exception
 
         /**
          * Deprecated in YouTube v18.31.xx+
@@ -47,7 +45,8 @@ class ShortsSubscriptionsButtonPatch : BytecodePatch(
         ShortsSubscriptionsTabletParentFingerprint.result?.let { parentResult ->
             parentResult.mutableMethod.apply {
                 val targetIndex = getWideLiteralIndex(ReelPlayerFooter) - 1
-                if (getInstruction(targetIndex).opcode != Opcode.IPUT) return ShortsSubscriptionsTabletFingerprint.toErrorResult()
+                if (getInstruction(targetIndex).opcode != Opcode.IPUT)
+                    throw ShortsSubscriptionsTabletFingerprint.exception
                 subscriptionFieldReference =
                     (getInstruction<ReferenceInstruction>(targetIndex)).reference as FieldReference
             }
@@ -75,10 +74,9 @@ class ShortsSubscriptionsButtonPatch : BytecodePatch(
                         )
                     }
                 }
-            } ?: return ShortsSubscriptionsTabletFingerprint.toErrorResult()
-        } ?: return ShortsSubscriptionsTabletParentFingerprint.toErrorResult()
+            } ?: throw ShortsSubscriptionsTabletFingerprint.exception
+        } ?: throw ShortsSubscriptionsTabletParentFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsToolBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsToolBarPatch.kt
index 05c4c035f..254cd567e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsToolBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/patch/ShortsToolBarPatch.kt
@@ -1,14 +1,11 @@
 package app.revanced.patches.youtube.shorts.shortscomponent.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.getInstruction
 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.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.ShortsCommentFingerprint
 import app.revanced.patches.youtube.utils.fingerprints.SetToolBarPaddingFingerprint
@@ -25,7 +22,7 @@ class ShortsToolBarPatch : BytecodePatch(
         ShortsCommentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SetToolBarPaddingFingerprint.result?.let {
             val targetIndex = it.mutableMethod.getWideLiteralIndex(ToolBarPaddingHome) + 3
             (context.toMethodWalker(it.method)
@@ -34,7 +31,7 @@ class ShortsToolBarPatch : BytecodePatch(
                     ).apply {
                     val targetParameter = getInstruction<ReferenceInstruction>(0).reference
                     if (!targetParameter.toString().endsWith("Landroid/support/v7/widget/Toolbar;"))
-                        return PatchResultError("Method signature parameter did not match: $targetParameter")
+                        throw PatchException("Method signature parameter did not match: $targetParameter")
                     val targetRegister = getInstruction<TwoRegisterInstruction>(0).registerA
 
                     addInstruction(
@@ -43,10 +40,9 @@ class ShortsToolBarPatch : BytecodePatch(
                     )
                 }
 
-        } ?: return SetToolBarPaddingFingerprint.toErrorResult()
+        } ?: throw SetToolBarPaddingFingerprint.exception
 
         ShortsCommentFingerprint.injectIndex(1)
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortsnavigationbar/patch/ShortsNavigationBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortsnavigationbar/patch/ShortsNavigationBarPatch.kt
index 21151cbf2..06b29be08 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortsnavigationbar/patch/ShortsNavigationBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortsnavigationbar/patch/ShortsNavigationBarPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.shorts.shortsnavigationbar.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.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.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.shorts.shortsnavigationbar.fingerprints.BottomNavigationBarFingerprint
 import app.revanced.patches.youtube.shorts.shortsnavigationbar.fingerprints.RenderBottomNavigationBarFingerprint
@@ -25,7 +22,7 @@ class ShortsNavigationBarPatch : BytecodePatch(
         RenderBottomNavigationBarFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         PivotBarCreateButtonViewFingerprint.result?.let { parentResult ->
             SetPivotBarFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let {
@@ -38,8 +35,8 @@ class ShortsNavigationBarPatch : BytecodePatch(
                         "sput-object v$register, $SHORTS->pivotBar:Ljava/lang/Object;"
                     )
                 }
-            } ?: return SetPivotBarFingerprint.toErrorResult()
-        } ?: return PivotBarCreateButtonViewFingerprint.toErrorResult()
+            } ?: throw SetPivotBarFingerprint.exception
+        } ?: throw PivotBarCreateButtonViewFingerprint.exception
 
         RenderBottomNavigationBarFingerprint.result?.let {
             (context
@@ -52,7 +49,7 @@ class ShortsNavigationBarPatch : BytecodePatch(
                         "invoke-static {}, $SHORTS->hideShortsPlayerNavigationBar()V"
                     )
                 }
-        } ?: return RenderBottomNavigationBarFingerprint.toErrorResult()
+        } ?: throw RenderBottomNavigationBarFingerprint.exception
 
         BottomNavigationBarFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -66,8 +63,7 @@ class ShortsNavigationBarPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return BottomNavigationBarFingerprint.toErrorResult()
+        } ?: throw BottomNavigationBarFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/patch/DisableShortsOnStartupPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/patch/DisableShortsOnStartupPatch.kt
index 4db7862af..ca23f6b09 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/patch/DisableShortsOnStartupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/patch/DisableShortsOnStartupPatch.kt
@@ -1,15 +1,12 @@
 package app.revanced.patches.youtube.shorts.startupshortsreset.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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
@@ -24,11 +21,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Disables playing YouTube Shorts when launching YouTube.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class DisableShortsOnStartupPatch : BytecodePatch(
     listOf(UserWasInShortsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         UserWasInShortsFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -45,7 +41,7 @@ class DisableShortsOnStartupPatch : BytecodePatch(
                     ExternalLabel("show_startup_shorts_player", getInstruction(targetIndex + 1))
                 )
             }
-        } ?: return UserWasInShortsFingerprint.toErrorResult()
+        } ?: throw UserWasInShortsFingerprint.exception
 
         /**
          * Add settings
@@ -60,6 +56,5 @@ class DisableShortsOnStartupPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("disable-startup-shorts-player")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/swipe/hdrbrightness/patch/HDRBrightnessPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/swipe/hdrbrightness/patch/HDRBrightnessPatch.kt
index 436532cce..5e7e69da8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/swipe/hdrbrightness/patch/HDRBrightnessPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/swipe/hdrbrightness/patch/HDRBrightnessPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.swipe.hdrbrightness.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.util.smali.ExternalLabel
 import app.revanced.patches.youtube.swipe.hdrbrightness.fingerprints.HDRBrightnessFingerprint
 import app.revanced.util.integrations.Constants.SWIPE_PATH
@@ -14,7 +12,7 @@ import app.revanced.util.integrations.Constants.SWIPE_PATH
 class HDRBrightnessPatch : BytecodePatch(
     listOf(HDRBrightnessFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         HDRBrightnessFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -27,8 +25,7 @@ class HDRBrightnessPatch : BytecodePatch(
                         """, ExternalLabel("default", getInstruction(0))
                 )
             }
-        } ?: return HDRBrightnessFingerprint.toErrorResult()
+        } ?: throw HDRBrightnessFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/swipe/swipecontrols/bytecode/patch/SwipeControlsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/swipe/swipecontrols/bytecode/patch/SwipeControlsBytecodePatch.kt
index c4eb57630..119f9a62e 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/swipe/swipecontrols/bytecode/patch/SwipeControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/swipe/swipecontrols/bytecode/patch/SwipeControlsBytecodePatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.youtube.swipe.swipecontrols.bytecode.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.extensions.transformMethods
+import app.revanced.extensions.traverseClassHierarchy
 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.util.TypeUtil.traverseClassHierarchy
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.youtube.swipe.swipecontrols.bytecode.fingerprints.SwipeControlsHostActivityFingerprint
 import app.revanced.patches.youtube.swipe.swipecontrols.bytecode.fingerprints.WatchWhileActivityFingerprint
@@ -22,11 +20,11 @@ class SwipeControlsBytecodePatch : BytecodePatch(
         WatchWhileActivityFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         val wrapperClass = SwipeControlsHostActivityFingerprint.result?.mutableClass
-            ?: return SwipeControlsHostActivityFingerprint.toErrorResult()
+            ?: throw SwipeControlsHostActivityFingerprint.exception
         val targetClass = WatchWhileActivityFingerprint.result?.mutableClass
-            ?: return WatchWhileActivityFingerprint.toErrorResult()
+            ?: throw WatchWhileActivityFingerprint.exception
 
         // inject the wrapper class from integrations into the class hierarchy of WatchWhileActivity
         wrapperClass.setSuperClass(targetClass.superclass)
@@ -49,6 +47,5 @@ class SwipeControlsBytecodePatch : BytecodePatch(
             }
         }
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/swipe/swipecontrols/resource/patch/SwipeControlsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/swipe/swipecontrols/resource/patch/SwipeControlsPatch.kt
index 5b44cbb6d..8903fd0d5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/swipe/swipecontrols/resource/patch/SwipeControlsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/swipe/swipecontrols/resource/patch/SwipeControlsPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.swipe.swipecontrols.resource.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.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
@@ -27,9 +24,8 @@ import app.revanced.util.resources.ResourceUtils.copyResources
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class SwipeControlsPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         /**
          * Add settings
@@ -53,6 +49,5 @@ class SwipeControlsPatch : ResourcePatch {
                 "ic_sc_volume_normal.xml"
             )
         )
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/clientspoof/patch/ClientSpoofPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/clientspoof/patch/ClientSpoofPatch.kt
index 8fcd67993..056b2179c 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/clientspoof/patch/ClientSpoofPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/clientspoof/patch/ClientSpoofPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.utils.fix.clientspoof.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.youtube.utils.fix.clientspoof.fingerprints.UserAgentHeaderBuilderFingerprint
 import app.revanced.patches.youtube.utils.microg.shared.Constants.PACKAGE_NAME
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@@ -14,7 +12,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 {
             it.mutableMethod.apply {
@@ -27,8 +25,7 @@ class ClientSpoofPatch : BytecodePatch(
                     "const-string v$packageNameRegister, \"$PACKAGE_NAME\""
                 )
             }
-        } ?: return UserAgentHeaderBuilderFingerprint.toErrorResult()
+        } ?: throw UserAgentHeaderBuilderFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/doublebacktoclose/patch/DoubleBackToClosePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/doublebacktoclose/patch/DoubleBackToClosePatch.kt
index 8f5f98586..079968f7b 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/doublebacktoclose/patch/DoubleBackToClosePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/doublebacktoclose/patch/DoubleBackToClosePatch.kt
@@ -1,13 +1,10 @@
 package app.revanced.patches.youtube.utils.fix.doublebacktoclose.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 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.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.utils.fingerprints.OnBackPressedFingerprint
 import app.revanced.patches.youtube.utils.fix.doublebacktoclose.fingerprint.ScrollPositionFingerprint
@@ -22,7 +19,7 @@ class DoubleBackToClosePatch : BytecodePatch(
         ScrollTopParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         /**
          * Hook onBackPressed method inside WatchWhileActivity
@@ -38,7 +35,7 @@ class DoubleBackToClosePatch : BytecodePatch(
                             "closeActivityOnBackPressed(Landroid/app/Activity;)V"
                 )
             }
-        } ?: return OnBackPressedFingerprint.toErrorResult()
+        } ?: throw OnBackPressedFingerprint.exception
 
 
         /**
@@ -52,7 +49,7 @@ class DoubleBackToClosePatch : BytecodePatch(
             val insertIndex = insertMethod.implementation!!.instructions.size - 1 - 1
 
             insertMethod.injectScrollView(insertIndex, "onStartScrollView")
-        } ?: return ScrollPositionFingerprint.toErrorResult()
+        } ?: throw ScrollPositionFingerprint.exception
 
 
         /**
@@ -63,10 +60,9 @@ class DoubleBackToClosePatch : BytecodePatch(
                 val insertIndex = it.scanResult.patternScanResult!!.endIndex
 
                 it.mutableMethod.injectScrollView(insertIndex, "onStopScrollView")
-            } ?: return ScrollTopFingerprint.toErrorResult()
-        } ?: return ScrollTopParentFingerprint.toErrorResult()
+            } ?: throw ScrollTopFingerprint.exception
+        } ?: throw ScrollTopParentFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/patch/SpoofPlayerParameterPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/patch/SpoofPlayerParameterPatch.kt
index 5ff2a90ed..91e4f32e1 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/patch/SpoofPlayerParameterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/patch/SpoofPlayerParameterPatch.kt
@@ -1,18 +1,14 @@
 package app.revanced.patches.youtube.utils.fix.parameter.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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.patcher.util.proxy.mutableTypes.MutableMethod
@@ -38,7 +34,6 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class SpoofPlayerParameterPatch : BytecodePatch(
     listOf(
         ProtobufParameterBuilderFingerprint,
@@ -46,7 +41,7 @@ class SpoofPlayerParameterPatch : BytecodePatch(
         StoryboardThumbnailParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         // hook parameter
         ProtobufParameterBuilderFingerprint.result?.let {
@@ -65,7 +60,7 @@ class SpoofPlayerParameterPatch : BytecodePatch(
                     """
                     )
                 }
-        } ?: return ProtobufParameterBuilderFingerprint.toErrorResult()
+        } ?: throw ProtobufParameterBuilderFingerprint.exception
 
         // When the player parameter is spoofed in incognito mode, this value will always be false
         // If this value is true, the timestamp and chapter are shown when tapping the seekbar.
@@ -92,8 +87,8 @@ class SpoofPlayerParameterPatch : BytecodePatch(
                     )
                     removeInstruction(targetIndex)
                 }
-            } ?: return StoryboardThumbnailFingerprint.toErrorResult()
-        } ?: return StoryboardThumbnailParentFingerprint.toErrorResult()
+            } ?: throw StoryboardThumbnailFingerprint.exception
+        } ?: throw StoryboardThumbnailParentFingerprint.exception
 
         // Seekbar thumbnail now show up but are always a blank image.
         // Additional changes are needed to force the client to generate the thumbnails (assuming it's possible),
@@ -111,7 +106,7 @@ class SpoofPlayerParameterPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return ScrubbedPreviewLayoutFingerprint.toErrorResult()
+        } ?: throw ScrubbedPreviewLayoutFingerprint.exception
 
         /**
          * Add settings
@@ -122,7 +117,6 @@ class SpoofPlayerParameterPatch : BytecodePatch(
             )
         )
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/swiperefresh/patch/SwipeRefreshPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/swiperefresh/patch/SwipeRefreshPatch.kt
index 91a301198..ba7b88f3d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/swiperefresh/patch/SwipeRefreshPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/swiperefresh/patch/SwipeRefreshPatch.kt
@@ -1,19 +1,17 @@
 package app.revanced.patches.youtube.utils.fix.swiperefresh.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.youtube.utils.fix.swiperefresh.fingerprint.SwipeRefreshLayoutFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 class SwipeRefreshPatch : BytecodePatch(
     listOf(SwipeRefreshLayoutFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         SwipeRefreshLayoutFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -25,8 +23,7 @@ class SwipeRefreshPatch : BytecodePatch(
                     "const/4 v$register, 0x0"
                 )
             }
-        } ?: return SwipeRefreshLayoutFingerprint.toErrorResult()
+        } ?: throw SwipeRefreshLayoutFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/litho/patch/LithoFilterPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/litho/patch/LithoFilterPatch.kt
index ee38046f0..cf4ff0243 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/litho/patch/LithoFilterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/litho/patch/LithoFilterPatch.kt
@@ -1,16 +1,12 @@
 package app.revanced.patches.youtube.utils.litho.patch
 
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Version
+import app.revanced.extensions.exception
 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.removeInstructions
 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.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.patch.litho.ComponentParserPatch
@@ -32,7 +28,6 @@ import java.io.Closeable
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class LithoFilterPatch : BytecodePatch(
     listOf(
         GeneralByteBufferFingerprint,
@@ -40,13 +35,13 @@ class LithoFilterPatch : BytecodePatch(
         LowLevelByteBufferFingerprint
     )
 ), Closeable {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
 
         LowLevelByteBufferFingerprint.result?.mutableMethod?.addInstruction(
             0,
             "invoke-static { p0 }, $ADS_PATH/LowLevelFilter;->setProtoBuffer(Ljava/nio/ByteBuffer;)V"
-        ) ?: return LowLevelByteBufferFingerprint.toErrorResult()
+        ) ?: throw LowLevelByteBufferFingerprint.exception
 
         GeneralByteBufferFingerprint.result?.let {
             (context
@@ -59,7 +54,7 @@ class LithoFilterPatch : BytecodePatch(
                         "invoke-static { p2 }, $ADS_PATH/LithoFilterPatch;->setProtoBuffer(Ljava/nio/ByteBuffer;)V"
                     )
                 }
-        } ?: return GeneralByteBufferFingerprint.toErrorResult()
+        } ?: throw GeneralByteBufferFingerprint.exception
 
         generalHook("$ADS_PATH/LithoFilterPatch;->filters")
 
@@ -76,9 +71,8 @@ class LithoFilterPatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return LithoFilterFingerprint.toErrorResult()
+        } ?: throw LithoFilterFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     override fun close() = LithoFilterFingerprint.result!!
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/litho/patch/LithoThemePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/litho/patch/LithoThemePatch.kt
index 78ae6ec75..82690faa2 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/litho/patch/LithoThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/litho/patch/LithoThemePatch.kt
@@ -1,11 +1,9 @@
 package app.revanced.patches.youtube.utils.litho.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.utils.litho.fingerprints.LithoThemeFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
@@ -17,7 +15,7 @@ class LithoThemePatch : BytecodePatch(
         LithoThemeFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         LithoThemeFingerprint.result?.mutableMethod?.let {
             with(it.implementation!!.instructions) {
@@ -30,9 +28,8 @@ class LithoThemePatch : BytecodePatch(
                     break
                 }
             }
-        } ?: return LithoThemeFingerprint.toErrorResult()
+        } ?: throw LithoThemeFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/microg/bytecode/patch/MicroGBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/microg/bytecode/patch/MicroGBytecodePatch.kt
index 62a9d0c9b..353573683 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/microg/bytecode/patch/MicroGBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/microg/bytecode/patch/MicroGBytecodePatch.kt
@@ -2,9 +2,7 @@ package app.revanced.patches.youtube.utils.microg.bytecode.patch
 
 import app.revanced.patcher.data.BytecodeContext
 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.patch.packagename.PackageNamePatch
 import app.revanced.patches.youtube.utils.fix.clientspoof.patch.ClientSpoofPatch
@@ -36,13 +34,13 @@ class MicroGBytecodePatch : BytecodePatch(
         ServiceCheckFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         val packageName = PackageNamePatch.YouTubePackageName
-            ?: throw PatchResultError("Invalid package name.")
+            ?: throw PatchException("Invalid package name.")
 
         if (packageName == PACKAGE_NAME)
-            throw PatchResultError("Original package name is not available as package name for MicroG build.")
+            throw PatchException("Original package name is not available as package name for MicroG build.")
 
         // apply common microG patch
         MicroGBytecodeHelper.patchBytecode(
@@ -68,6 +66,5 @@ class MicroGBytecodePatch : BytecodePatch(
 
         context.injectInit("MicroGPatch", "checkAvailability")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/microg/resource/patch/MicroGPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/microg/resource/patch/MicroGPatch.kt
index 47b084595..d57944b3a 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/microg/resource/patch/MicroGPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/microg/resource/patch/MicroGPatch.kt
@@ -2,11 +2,8 @@ package app.revanced.patches.youtube.utils.microg.resource.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.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.patcher.patch.annotations.Patch
@@ -33,15 +30,14 @@ import app.revanced.util.resources.ResourceHelper.setMicroG
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class MicroGPatch : ResourcePatch {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         val packageName = PackageNamePatch.YouTubePackageName
-            ?: throw PatchResultError("Invalid package name.")
+            ?: throw PatchException("Invalid package name.")
 
         if (packageName == PACKAGE_NAME)
-            throw PatchResultError("Original package name is not available as package name for MicroG build.")
+            throw PatchException("Original package name is not available as package name for MicroG build.")
 
         /**
          * Add settings
@@ -73,6 +69,5 @@ class MicroGPatch : ResourcePatch {
 
         setMicroG(packageName)
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/patch/NavBarIndexHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/patch/NavBarIndexHookPatch.kt
index b486acde5..f07a19580 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/patch/NavBarIndexHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/patch/NavBarIndexHookPatch.kt
@@ -1,14 +1,12 @@
 package app.revanced.patches.youtube.utils.navbarindex.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.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.patches.youtube.utils.fingerprints.OnBackPressedFingerprint
 import app.revanced.patches.youtube.utils.litho.patch.LithoFilterPatch
@@ -37,7 +35,7 @@ class NavBarIndexHookPatch : BytecodePatch(
         TopBarButtonFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         OnBackPressedFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -46,7 +44,7 @@ class NavBarIndexHookPatch : BytecodePatch(
                     "invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->setLastNavBarIndex()V"
                 )
             }
-        } ?: return OnBackPressedFingerprint.toErrorResult()
+        } ?: throw OnBackPressedFingerprint.exception
 
         TopBarButtonFingerprint.injectIndex(0)
 
@@ -77,13 +75,12 @@ class NavBarIndexHookPatch : BytecodePatch(
                     break
                 }
             }
-        } ?: return NavBarBuilderFingerprint.toErrorResult()
+        } ?: throw NavBarBuilderFingerprint.exception
 
         LithoFilterPatch.addFilter("$PATCHES_PATH/ads/NavBarIndexFilter;")
 
         context.injectInit("NavBarIndexPatch", "initializeIndex")
 
-        return PatchResultSuccess()
     }
 
     companion object {
@@ -100,7 +97,7 @@ class NavBarIndexHookPatch : BytecodePatch(
                         """
                     )
                 }
-            } ?: throw toErrorResult()
+            } ?: throw exception
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/patch/OverrideSpeedHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/patch/OverrideSpeedHookPatch.kt
index 633a5aebb..c720c1cc8 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/patch/OverrideSpeedHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/patch/OverrideSpeedHookPatch.kt
@@ -1,8 +1,7 @@
 package app.revanced.patches.youtube.utils.overridespeed.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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
@@ -11,8 +10,6 @@ import app.revanced.patcher.extensions.or
 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.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
@@ -39,7 +36,7 @@ class OverrideSpeedHookPatch : BytecodePatch(
         SpeedClassFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         PlaybackSpeedParentFingerprint.result?.let { parentResult ->
             val parentClassDef = parentResult.classDef
@@ -100,8 +97,8 @@ class OverrideSpeedHookPatch : BytecodePatch(
                     }
                 }
 
-            } ?: return PlaybackSpeedChangedFingerprint.toErrorResult()
-        } ?: return PlaybackSpeedParentFingerprint.toErrorResult()
+            } ?: throw PlaybackSpeedChangedFingerprint.exception
+        } ?: throw PlaybackSpeedParentFingerprint.exception
 
 
         SpeedClassFingerprint.result?.let {
@@ -119,7 +116,7 @@ class OverrideSpeedHookPatch : BytecodePatch(
                 )
             }
 
-        } ?: return SpeedClassFingerprint.toErrorResult()
+        } ?: throw SpeedClassFingerprint.exception
 
         PlaybackSpeedPatchFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -143,9 +140,8 @@ class OverrideSpeedHookPatch : BytecodePatch(
                 )
             }
 
-        } ?: return PlaybackSpeedPatchFingerprint.toErrorResult()
+        } ?: throw PlaybackSpeedPatchFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/playerbutton/patch/PlayerButtonHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/playerbutton/patch/PlayerButtonHookPatch.kt
index bc8c9df63..204723aaa 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/playerbutton/patch/PlayerButtonHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/playerbutton/patch/PlayerButtonHookPatch.kt
@@ -1,13 +1,11 @@
 package app.revanced.patches.youtube.utils.playerbutton.patch
 
+import app.revanced.extensions.exception
 import app.revanced.extensions.findMutableMethodOf
-import app.revanced.extensions.toErrorResult
 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.patches.youtube.utils.playerbutton.fingerprints.LiveChatFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
@@ -20,7 +18,7 @@ import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction35c
 class PlayerButtonHookPatch : BytecodePatch(
     listOf(LiveChatFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         LiveChatFingerprint.result?.let {
             val endIndex = it.scanResult.patternScanResult!!.endIndex
@@ -62,8 +60,7 @@ class PlayerButtonHookPatch : BytecodePatch(
                     }
                 }
             }
-        } ?: return LiveChatFingerprint.toErrorResult()
+        } ?: throw LiveChatFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/patch/PlayerControlsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/patch/PlayerControlsPatch.kt
index c681cda64..128722965 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/patch/PlayerControlsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/patch/PlayerControlsPatch.kt
@@ -1,15 +1,13 @@
 package app.revanced.patches.youtube.utils.playercontrols.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 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.fingerprint.method.impl.MethodFingerprintResult
 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.MutableMethod
 import app.revanced.patches.youtube.utils.fingerprints.YouTubeControlsOverlayFingerprint
@@ -40,7 +38,7 @@ class PlayerControlsPatch : BytecodePatch(
         YouTubeControlsOverlayFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         fun MutableMethod.findReference(targetString: String): Reference {
             val targetIndex = getStringIndex(targetString) + 2
@@ -53,7 +51,7 @@ class PlayerControlsPatch : BytecodePatch(
                 if (getInstruction<TwoRegisterInstruction>(index).registerA == targetRegister)
                     return getInstruction<ReferenceInstruction>(index).reference
             }
-            throw PatchResultError("Reference not found: $targetString")
+            throw PatchException("Reference not found: $targetString")
         }
 
         PlayerControlsVisibilityModelFingerprint.result?.classDef?.let { classDef ->
@@ -63,7 +61,7 @@ class PlayerControlsPatch : BytecodePatch(
                         context,
                         classDef
                     )
-                }.result?.mutableMethod ?: return SeekEDUVisibleFingerprint.toErrorResult()
+                }.result?.mutableMethod ?: throw SeekEDUVisibleFingerprint.exception
 
             userScrubbingMutableMethod =
                 UserScrubbingFingerprint.also {
@@ -71,8 +69,8 @@ class PlayerControlsPatch : BytecodePatch(
                         context,
                         classDef
                     )
-                }.result?.mutableMethod ?: return UserScrubbingFingerprint.toErrorResult()
-        } ?: return PlayerControlsVisibilityModelFingerprint.toErrorResult()
+                }.result?.mutableMethod ?: throw UserScrubbingFingerprint.exception
+        } ?: throw PlayerControlsVisibilityModelFingerprint.exception
 
         YouTubeControlsOverlayFingerprint.result?.classDef?.let { classDef ->
             playerControlsVisibilityMutableMethod =
@@ -82,16 +80,16 @@ class PlayerControlsPatch : BytecodePatch(
                         classDef
                     )
                 }.result?.mutableMethod
-                    ?: return PlayerControlsVisibilityFingerprint.toErrorResult()
-        } ?: return YouTubeControlsOverlayFingerprint.toErrorResult()
+                    ?: throw PlayerControlsVisibilityFingerprint.exception
+        } ?: throw YouTubeControlsOverlayFingerprint.exception
 
         controlsLayoutInflateResult =
             ControlsLayoutInflateFingerprint.result
-                ?: return ControlsLayoutInflateFingerprint.toErrorResult()
+                ?: throw ControlsLayoutInflateFingerprint.exception
 
         inflateResult =
             BottomControlsInflateFingerprint.result
-                ?: return BottomControlsInflateFingerprint.toErrorResult()
+                ?: throw BottomControlsInflateFingerprint.exception
 
         FullscreenEngagementSpeedEduVisibleParentFingerprint.result?.let { parentResult ->
             parentResult.mutableMethod.apply {
@@ -107,10 +105,9 @@ class PlayerControlsPatch : BytecodePatch(
                         parentResult.classDef
                     )
                 }.result?.mutableMethod
-                    ?: return FullscreenEngagementSpeedEduVisibleFingerprint.toErrorResult()
-        } ?: return FullscreenEngagementSpeedEduVisibleParentFingerprint.toErrorResult()
+                    ?: throw FullscreenEngagementSpeedEduVisibleFingerprint.exception
+        } ?: throw FullscreenEngagementSpeedEduVisibleParentFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/playertype/patch/PlayerTypeHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/playertype/patch/PlayerTypeHookPatch.kt
index c1c26d48f..b5de2eedb 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/playertype/patch/PlayerTypeHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/playertype/patch/PlayerTypeHookPatch.kt
@@ -1,14 +1,12 @@
 package app.revanced.patches.youtube.utils.playertype.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.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.patches.youtube.utils.fingerprints.YouTubeControlsOverlayFingerprint
 import app.revanced.patches.youtube.utils.playertype.fingerprint.PlayerTypeFingerprint
@@ -24,7 +22,7 @@ class PlayerTypeHookPatch : BytecodePatch(
         YouTubeControlsOverlayFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         PlayerTypeFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -33,7 +31,7 @@ class PlayerTypeHookPatch : BytecodePatch(
                     "invoke-static {p1}, $INTEGRATIONS_CLASS_DESCRIPTOR->setPlayerType(Ljava/lang/Enum;)V"
                 )
             }
-        } ?: return PlayerTypeFingerprint.toErrorResult()
+        } ?: throw PlayerTypeFingerprint.exception
 
         YouTubeControlsOverlayFingerprint.result?.let { parentResult ->
             VideoStateFingerprint.also {
@@ -53,10 +51,9 @@ class PlayerTypeHookPatch : BytecodePatch(
                         """
                     )
                 }
-            } ?: return VideoStateFingerprint.toErrorResult()
-        } ?: return YouTubeControlsOverlayFingerprint.toErrorResult()
+            } ?: throw VideoStateFingerprint.exception
+        } ?: throw YouTubeControlsOverlayFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/quickactions/patch/QuickActionsHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/quickactions/patch/QuickActionsHookPatch.kt
index 8058db5e5..4d0d62cc3 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/quickactions/patch/QuickActionsHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/quickactions/patch/QuickActionsHookPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.utils.quickactions.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.utils.quickactions.fingerprints.QuickActionsElementFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
@@ -17,7 +15,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class QuickActionsHookPatch : BytecodePatch(
     listOf(QuickActionsElementFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         QuickActionsElementFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -29,8 +27,7 @@ class QuickActionsHookPatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $FULLSCREEN->hideQuickActions(Landroid/view/View;)V"
                 )
             }
-        } ?: return QuickActionsElementFingerprint.toErrorResult()
+        } ?: throw QuickActionsElementFingerprint.exception
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/patch/SharedResourceIdPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/patch/SharedResourceIdPatch.kt
index 6fb7aa2b0..b8742b4ae 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/patch/SharedResourceIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/patch/SharedResourceIdPatch.kt
@@ -1,9 +1,7 @@
 package app.revanced.patches.youtube.utils.resourceid.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.patch.mapping.ResourceMappingPatch
@@ -86,12 +84,12 @@ class SharedResourceIdPatch : ResourcePatch {
         var YtOutlineSearchBlack: Long = -1
     }
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
 
         fun find(resourceType: ResourceType, resourceName: String) = ResourceMappingPatch
             .resourceMappings
             .find { it.type == resourceType.value && it.name == resourceName }?.id
-            ?: throw PatchResultError("Failed to find resource id : $resourceName")
+            ?: throw PatchException("Failed to find resource id : $resourceName")
 
         AccountSwitcherAccessibility = find(STRING, "account_switcher_accessibility_label")
         AccessibilityCaptionsButtonName = find(STRING, "accessibility_captions_button_name")
@@ -161,6 +159,5 @@ class SharedResourceIdPatch : ResourcePatch {
         YtOutlineFireBlack = find(DRAWABLE, "yt_outline_fire_black_24")
         YtOutlineSearchBlack = find(DRAWABLE, "yt_outline_search_black_24")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/patch/ReturnYouTubeDislikePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/patch/ReturnYouTubeDislikePatch.kt
index ec0fca64c..2a1f02ecc 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/patch/ReturnYouTubeDislikePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/patch/ReturnYouTubeDislikePatch.kt
@@ -1,9 +1,8 @@
 package app.revanced.patches.youtube.utils.returnyoutubedislike.general.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@@ -12,8 +11,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.patch.annotations.Patch
 import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
@@ -47,7 +44,6 @@ import com.android.tools.smali.dexlib2.iface.reference.Reference
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class ReturnYouTubeDislikePatch : BytecodePatch(
     listOf(
         DislikeFingerprint,
@@ -56,13 +52,13 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
         TextComponentConstructorFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         listOf(
             LikeFingerprint.toPatch(Vote.LIKE),
             DislikeFingerprint.toPatch(Vote.DISLIKE),
             RemoveLikeFingerprint.toPatch(Vote.REMOVE_LIKE)
         ).forEach { (fingerprint, vote) ->
-            with(fingerprint.result ?: return fingerprint.toErrorResult()) {
+            with(fingerprint.result ?: throw fingerprint.exception) {
                 mutableMethod.addInstructions(
                     0,
                     """
@@ -87,7 +83,7 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
                     conversionContextFieldReference =
                         getInstruction<ReferenceInstruction>(conversionContextIndex).reference
                 }
-            } ?: return TextComponentContextFingerprint.toErrorResult()
+            } ?: throw TextComponentContextFingerprint.exception
 
             TextComponentTmpFingerprint.also {
                 it.resolve(
@@ -100,7 +96,7 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
                     tmpRegister =
                         getInstruction<FiveRegisterInstruction>(startIndex).registerE
                 }
-            } ?: return TextComponentTmpFingerprint.toErrorResult()
+            } ?: throw TextComponentTmpFingerprint.exception
 
 
             val textComponentAtomicReferenceResult =
@@ -110,7 +106,7 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
                     ?: TextComponentAtomicReferenceLegacyFingerprint.also {
                         it.resolve(context, parentResult.classDef)
                     }.result
-                    ?: return TextComponentAtomicReferenceLegacyFingerprint.toErrorResult()
+                    ?: throw TextComponentAtomicReferenceLegacyFingerprint.exception
 
             TextComponentAtomicReferenceFingerprint.also {
                 it.resolve(context, parentResult.classDef)
@@ -156,7 +152,7 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
                     removeInstruction(insertIndex)
                 }
             }
-        } ?: return TextComponentConstructorFingerprint.toErrorResult()
+        } ?: throw TextComponentConstructorFingerprint.exception
 
 
         VideoIdPatch.injectCall("$INTEGRATIONS_RYD_CLASS_DESCRIPTOR->newVideoLoaded(Ljava/lang/String;)V")
@@ -168,7 +164,6 @@ class ReturnYouTubeDislikePatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("return-youtube-dislike")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/oldlayout/patch/ReturnYouTubeDislikeOldLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/oldlayout/patch/ReturnYouTubeDislikeOldLayoutPatch.kt
index c0bea36d2..eb20dc275 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/oldlayout/patch/ReturnYouTubeDislikeOldLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/oldlayout/patch/ReturnYouTubeDislikeOldLayoutPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.utils.returnyoutubedislike.oldlayout.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.DislikeButton
@@ -19,7 +17,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class ReturnYouTubeDislikeOldLayoutPatch : BytecodePatch(
     listOf(ButtonTagFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         ButtonTagFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -35,9 +33,8 @@ class ReturnYouTubeDislikeOldLayoutPatch : BytecodePatch(
                     "invoke-static {v$resourceIdentifierRegister, v$textViewRegister}, $INTEGRATIONS_RYD_CLASS_DESCRIPTOR->setOldUILayoutDislikes(ILandroid/widget/TextView;)V"
                 )
             }
-        } ?: return ButtonTagFingerprint.toErrorResult()
+        } ?: throw ButtonTagFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/patch/ReturnYouTubeDislikeShortsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/patch/ReturnYouTubeDislikeShortsPatch.kt
index ba2b200c0..c224d31cc 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/patch/ReturnYouTubeDislikeShortsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/shorts/patch/ReturnYouTubeDislikeShortsPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.utils.returnyoutubedislike.shorts.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.util.smali.ExternalLabel
 import app.revanced.patches.youtube.utils.returnyoutubedislike.shorts.fingerprints.ShortsTextViewFingerprint
 import app.revanced.util.integrations.Constants.UTILS_PATH
@@ -15,7 +13,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 class ReturnYouTubeDislikeShortsPatch : BytecodePatch(
     listOf(ShortsTextViewFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         ShortsTextViewFingerprint.result?.let {
             it.mutableMethod.apply {
                 val patternResult = it.scanResult.patternScanResult!!
@@ -46,8 +44,7 @@ class ReturnYouTubeDislikeShortsPatch : BytecodePatch(
                     """, ExternalLabel("ryd_disabled", getInstruction(insertIndex))
                 )
             }
-        } ?: return ShortsTextViewFingerprint.toErrorResult()
-        return PatchResultSuccess()
+        } ?: throw ShortsTextViewFingerprint.exception
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/bytecode/patch/SettingsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/bytecode/patch/SettingsBytecodePatch.kt
index 3c82efc14..cc1d5f972 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/bytecode/patch/SettingsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/bytecode/patch/SettingsBytecodePatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.utils.settings.bytecode.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.DependsOn
 import app.revanced.patches.shared.patch.mapping.ResourceMappingPatch
 import app.revanced.patches.youtube.utils.integrations.patch.IntegrationsPatch
@@ -25,7 +23,7 @@ import app.revanced.util.integrations.Constants.INTEGRATIONS_PATH
 class SettingsBytecodePatch : BytecodePatch(
     listOf(ThemeSetterSystemFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         // apply the current theme of the settings page
         ThemeSetterSystemFingerprint.result?.let {
             it.mutableMethod.apply {
@@ -43,11 +41,10 @@ class SettingsBytecodePatch : BytecodePatch(
                     SET_THEME
                 )
             }
-        } ?: return ThemeSetterSystemFingerprint.toErrorResult()
+        } ?: throw ThemeSetterSystemFingerprint.exception
 
         context.injectInit("FirstRun", "initializationRVX")
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/resource/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/resource/patch/SettingsPatch.kt
index f55680da9..fd9e5f7c7 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/resource/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/resource/patch/SettingsPatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.utils.settings.resource.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.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.patch.settings.AbstractSettingsResourcePatch
@@ -38,13 +35,12 @@ import java.util.concurrent.TimeUnit
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class SettingsPatch : AbstractSettingsResourcePatch(
     "youtube/settings",
     "youtube/settings/host",
     true
 ) {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         super.execute(context)
         contexts = context
 
@@ -175,7 +171,6 @@ class SettingsPatch : AbstractSettingsResourcePatch(
                 .let(::copyResources)
         }
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
index 684cfea62..b2ee8f2f5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
@@ -1,6 +1,6 @@
 package app.revanced.patches.youtube.utils.sponsorblock.bytecode.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
@@ -8,8 +8,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.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.utils.fingerprints.SeekbarFingerprint
@@ -54,7 +52,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         YouTubeControlsOverlayFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         /**
          * Hook the video time methods
@@ -81,9 +79,9 @@ class SponsorBlockBytecodePatch : BytecodePatch(
                     mutableClass
                 )
             }.result?.mutableMethod
-                ?: return SeekbarOnDrawFingerprint.toErrorResult()
+                ?: throw SeekbarOnDrawFingerprint.exception
             insertInstructions = insertMethod.implementation!!.instructions
-        } ?: return SeekbarFingerprint.toErrorResult()
+        } ?: throw SeekbarFingerprint.exception
 
 
         /**
@@ -164,7 +162,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
                         """
                 )
             }
-        } ?: return TotalTimeFingerprint.toErrorResult()
+        } ?: throw TotalTimeFingerprint.exception
 
 
         /**
@@ -180,7 +178,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
                     "invoke-static {v$targetRegister}, $INTEGRATIONS_BUTTON_CLASS_DESCRIPTOR/ui/SponsorBlockViewController;->initialize(Landroid/view/ViewGroup;)V"
                 )
             }
-        } ?: return YouTubeControlsOverlayFingerprint.toErrorResult()
+        } ?: throw YouTubeControlsOverlayFingerprint.exception
 
 
         /**
@@ -213,10 +211,10 @@ class SponsorBlockBytecodePatch : BytecodePatch(
                                 break
                             }
                         }
-                    } ?: return SegmentPlaybackControllerFingerprint.toErrorResult()
+                    } ?: throw SegmentPlaybackControllerFingerprint.exception
                 }
-            } ?: return RectangleFieldInvalidatorFingerprint.toErrorResult()
-        } ?: return SeekbarFingerprint.toErrorResult()
+            } ?: throw RectangleFieldInvalidatorFingerprint.exception
+        } ?: throw SeekbarFingerprint.exception
 
 
         /**
@@ -226,7 +224,6 @@ class SponsorBlockBytecodePatch : BytecodePatch(
 
         context.injectInit("FirstRun", "initializationSB")
 
-        return PatchResultSuccess()
     }
 
     internal companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
index 7d9c593a0..f96d083fb 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
@@ -2,10 +2,7 @@ package app.revanced.patches.youtube.utils.sponsorblock.resource.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.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
@@ -26,10 +23,9 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class SponsorBlockResourcePatch : ResourcePatch {
 
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(context: ResourceContext) {
         /**
          * merge SponsorBlock drawables to main drawables
          */
@@ -105,6 +101,5 @@ class SponsorBlockResourcePatch : ResourcePatch {
 
         SettingsPatch.updatePatchStatus("sponsorblock")
 
-        return PatchResultSuccess()
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/videocpn/patch/VideoCpnPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/videocpn/patch/VideoCpnPatch.kt
index 1baa43b00..d94fa68a5 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/videocpn/patch/VideoCpnPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/videocpn/patch/VideoCpnPatch.kt
@@ -1,23 +1,20 @@
 package app.revanced.patches.youtube.utils.videocpn.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.utils.videocpn.fingerprint.OrganicPlaybackContextModelFingerprint
 
 class VideoCpnPatch : BytecodePatch(
     listOf(OrganicPlaybackContextModelFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         insertMethod = OrganicPlaybackContextModelFingerprint.result?.mutableMethod
-            ?: return OrganicPlaybackContextModelFingerprint.toErrorResult()
+            ?: throw OrganicPlaybackContextModelFingerprint.exception
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/general/patch/VideoIdPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/general/patch/VideoIdPatch.kt
index 8a50beb82..ccadf0e61 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/general/patch/VideoIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/general/patch/VideoIdPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.utils.videoid.general.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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
@@ -39,7 +36,7 @@ class VideoIdPatch : BytecodePatch(
         VideoLengthFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         PlayerInitFingerprint.result?.let { parentResult ->
             playerInitMethod =
@@ -73,8 +70,8 @@ class VideoIdPatch : BytecodePatch(
 
                     parentResult.mutableClass.methods.add(seekHelperMethod)
                 }
-            } ?: return SeekFingerprint.toErrorResult()
-        } ?: return PlayerInitFingerprint.toErrorResult()
+            } ?: throw SeekFingerprint.exception
+        } ?: throw PlayerInitFingerprint.exception
 
         /**
          * Set current video time
@@ -83,7 +80,7 @@ class VideoIdPatch : BytecodePatch(
             timeMethod = context.toMethodWalker(it.method)
                 .nextMethod(it.scanResult.patternScanResult!!.startIndex, true)
                 .getMethod() as MutableMethod
-        } ?: return PlayerControllerSetTimeReferenceFingerprint.toErrorResult()
+        } ?: throw PlayerControllerSetTimeReferenceFingerprint.exception
 
         /**
          * Hook the methods which set the time
@@ -104,7 +101,7 @@ class VideoIdPatch : BytecodePatch(
                     "invoke-static {v$primaryRegister, v$secondaryRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->setVideoLength(J)V"
                 )
             }
-        } ?: return VideoLengthFingerprint.toErrorResult()
+        } ?: throw VideoLengthFingerprint.exception
 
         VideoIdParentFingerprint.result?.let { parentResult ->
             VideoIdFingerprint.also {
@@ -119,12 +116,11 @@ class VideoIdPatch : BytecodePatch(
                     videoIdRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
                 }
                 offset++ // offset so setVideoId is called before any injected call
-            } ?: return VideoIdFingerprint.toErrorResult()
-        } ?: return VideoIdParentFingerprint.toErrorResult()
+            } ?: throw VideoIdFingerprint.exception
+        } ?: throw VideoIdParentFingerprint.exception
 
         injectCall("$VIDEO_PATH/VideoInformation;->setVideoId(Ljava/lang/String;)V")
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/withoutshorts/patch/VideoIdWithoutShortsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/withoutshorts/patch/VideoIdWithoutShortsPatch.kt
index 55a54f682..a6d9c2deb 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/withoutshorts/patch/VideoIdWithoutShortsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/utils/videoid/withoutshorts/patch/VideoIdWithoutShortsPatch.kt
@@ -1,12 +1,10 @@
 package app.revanced.patches.youtube.utils.videoid.withoutshorts.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 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.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.utils.videoid.withoutshorts.fingerprint.VideoIdWithoutShortsFingerprint
 import app.revanced.util.integrations.Constants.VIDEO_PATH
@@ -16,7 +14,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 class VideoIdWithoutShortsPatch : BytecodePatch(
     listOf(VideoIdWithoutShortsFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         VideoIdWithoutShortsFingerprint.result?.let {
             insertMethod = it.mutableMethod
@@ -27,11 +25,10 @@ class VideoIdWithoutShortsPatch : BytecodePatch(
 
             insertRegister =
                 insertMethod.getInstruction<OneRegisterInstruction>(insertIndex + 1).registerA
-        } ?: return VideoIdWithoutShortsFingerprint.toErrorResult()
+        } ?: throw VideoIdWithoutShortsFingerprint.exception
 
         injectCall("$VIDEO_PATH/VideoInformation;->setVideoId(Ljava/lang/String;)V")
 
-        return PatchResultSuccess()
     }
 
     companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/patch/CustomPlaybackSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/patch/CustomPlaybackSpeedPatch.kt
index ce0ec714d..8f5bb685f 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/patch/CustomPlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/patch/CustomPlaybackSpeedPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.video.customspeed.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.flyoutpanel.oldspeedlayout.patch.OldSpeedLayoutPatch
@@ -37,7 +34,6 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class CustomPlaybackSpeedPatch : BytecodePatch(
     listOf(
         SpeedArrayGeneratorFingerprint,
@@ -45,7 +41,7 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
         SpeedLimiterFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
         SpeedArrayGeneratorFingerprint.result?.let { result ->
             result.mutableMethod.apply {
                 val targetIndex = result.scanResult.patternScanResult!!.startIndex
@@ -97,7 +93,7 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
                     }
                 }
             }
-        } ?: return SpeedArrayGeneratorFingerprint.toErrorResult()
+        } ?: throw SpeedArrayGeneratorFingerprint.exception
 
         arrayOf(
             SpeedLimiterFallBackFingerprint,
@@ -124,7 +120,7 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
                         "const/high16 v$limiterMaxConstDestination, 0x41200000    # 10.0f"
                     )
                 }
-            } ?: return fingerprint.toErrorResult()
+            } ?: throw fingerprint.exception
         }
 
         /**
@@ -139,6 +135,5 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("custom-playback-speed")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/hdr/patch/DisableHdrVideoPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/hdr/patch/DisableHdrVideoPatch.kt
index 99338aca9..b3d09cfef 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/hdr/patch/DisableHdrVideoPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/hdr/patch/DisableHdrVideoPatch.kt
@@ -1,16 +1,12 @@
 package app.revanced.patches.youtube.video.hdr.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.toMethodWalker
 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.proxy.mutableTypes.MutableMethod
@@ -25,11 +21,10 @@ import app.revanced.util.integrations.Constants.VIDEO_PATH
 @Description("Disable HDR video.")
 @DependsOn([SettingsPatch::class])
 @YouTubeCompatibility
-@Version("0.0.1")
 class DisableHdrVideoPatch : BytecodePatch(
     listOf(HdrCapabilitiesFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         HdrCapabilitiesFingerprint.result?.let {
             with(
@@ -47,7 +42,7 @@ class DisableHdrVideoPatch : BytecodePatch(
                         """, ExternalLabel("default", getInstruction(0))
                 )
             }
-        } ?: return HdrCapabilitiesFingerprint.toErrorResult()
+        } ?: throw HdrCapabilitiesFingerprint.exception
 
         /**
          * Add settings
@@ -61,6 +56,5 @@ class DisableHdrVideoPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("disable-hdr-video")
 
-        return PatchResultSuccess()
     }
 }
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/VideoQualityPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/VideoQualityPatch.kt
index 25a668482..c1501d8b1 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/VideoQualityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/quality/patch/VideoQualityPatch.kt
@@ -1,17 +1,14 @@
 package app.revanced.patches.youtube.video.quality.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 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.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.youtube.utils.annotations.YouTubeCompatibility
@@ -41,7 +38,6 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class VideoQualityPatch : BytecodePatch(
     listOf(
         NewFlyoutPanelOnClickListenerFingerprint,
@@ -49,7 +45,7 @@ class VideoQualityPatch : BytecodePatch(
         VideoQualitySettingsParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         NewFlyoutPanelOnClickListenerFingerprint.result?.let { parentResult ->
             NewVideoQualityChangedFingerprint.also {
@@ -68,7 +64,7 @@ class VideoQualityPatch : BytecodePatch(
                     )
                 }
             }
-        } ?: return NewFlyoutPanelOnClickListenerFingerprint.toErrorResult()
+        } ?: throw NewFlyoutPanelOnClickListenerFingerprint.exception
 
         VideoQualitySetterFingerprint.result?.let { parentResult ->
             VideoQualityReferenceFingerprint.also {
@@ -85,7 +81,7 @@ class VideoQualityPatch : BytecodePatch(
                         .single { it.type == qualityFieldReference.type }.methods
                         .single { it.parameterTypes.first() == "I" }.name
                 }
-            } ?: return VideoQualityReferenceFingerprint.toErrorResult()
+            } ?: throw VideoQualityReferenceFingerprint.exception
 
             VideoUserQualityChangeFingerprint.also {
                 it.resolve(
@@ -95,8 +91,8 @@ class VideoQualityPatch : BytecodePatch(
             }.result?.mutableMethod?.addInstruction(
                 0,
                 "invoke-static {p3}, $INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR->userChangedQuality(I)V"
-            ) ?: return VideoUserQualityChangeFingerprint.toErrorResult()
-        } ?: return VideoQualitySetterFingerprint.toErrorResult()
+            ) ?: throw VideoUserQualityChangeFingerprint.exception
+        } ?: throw VideoQualitySetterFingerprint.exception
 
         VideoQualitySettingsParentFingerprint.result?.let { parentResult ->
             VideoQualitySettingsFingerprint.also {
@@ -107,7 +103,7 @@ class VideoQualityPatch : BytecodePatch(
             }.result?.mutableMethod?.let {
                 relayFieldReference =
                     it.getInstruction<ReferenceInstruction>(0).reference as FieldReference
-            } ?: return VideoQualitySettingsFingerprint.toErrorResult()
+            } ?: throw VideoQualitySettingsFingerprint.exception
 
             parentResult.mutableMethod.addInstructions(
                 0, """
@@ -118,7 +114,7 @@ class VideoQualityPatch : BytecodePatch(
                     move-result p2
                     """
             )
-        } ?: return VideoQualitySettingsParentFingerprint.toErrorResult()
+        } ?: throw VideoQualitySettingsParentFingerprint.exception
 
         VideoCpnPatch.injectCall("$INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;Z)V")
 
@@ -140,7 +136,6 @@ class VideoQualityPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("default-video-quality")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/PlaybackSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/PlaybackSpeedPatch.kt
index bc38330f4..d096ec89d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/PlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/PlaybackSpeedPatch.kt
@@ -1,16 +1,13 @@
 package app.revanced.patches.youtube.video.speed.patch
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 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.patches.youtube.utils.annotations.YouTubeCompatibility
@@ -33,11 +30,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
     ]
 )
 @YouTubeCompatibility
-@Version("0.0.1")
 class PlaybackSpeedPatch : BytecodePatch(
     listOf(NewFlyoutPanelOnClickListenerFingerprint)
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(context: BytecodeContext) {
 
         NewFlyoutPanelOnClickListenerFingerprint.result?.let { parentResult ->
             NewPlaybackSpeedChangedFingerprint.also {
@@ -57,8 +53,8 @@ class PlaybackSpeedPatch : BytecodePatch(
                         )
                     }
                 }
-            } ?: return NewPlaybackSpeedChangedFingerprint.toErrorResult()
-        } ?: return NewFlyoutPanelOnClickListenerFingerprint.toErrorResult()
+            } ?: throw NewPlaybackSpeedChangedFingerprint.exception
+        } ?: throw NewFlyoutPanelOnClickListenerFingerprint.exception
 
         VideoCpnPatch.injectCall("$INTEGRATIONS_PLAYBACK_SPEED_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;Z)V")
 
@@ -74,7 +70,6 @@ class PlaybackSpeedPatch : BytecodePatch(
 
         SettingsPatch.updatePatchStatus("default-playback-speed")
 
-        return PatchResultSuccess()
     }
 
     private companion object {
diff --git a/src/main/kotlin/app/revanced/util/microg/MicroGBytecodeHelper.kt b/src/main/kotlin/app/revanced/util/microg/MicroGBytecodeHelper.kt
index 3a8ba8d1c..5df2a508f 100644
--- a/src/main/kotlin/app/revanced/util/microg/MicroGBytecodeHelper.kt
+++ b/src/main/kotlin/app/revanced/util/microg/MicroGBytecodeHelper.kt
@@ -1,6 +1,6 @@
 package app.revanced.util.microg
 
-import app.revanced.extensions.toErrorResult
+import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
@@ -78,7 +78,7 @@ internal object MicroGBytecodeHelper {
                         "const-string v$targetRegister, \"$toPackageName\""
                     )
                 }
-            } ?: throw primeMethodFingerprint.toErrorResult()
+            } ?: throw primeMethodFingerprint.exception
         }
     }
 
@@ -235,7 +235,7 @@ internal object MicroGBytecodeHelper {
                         0, stringInstructions
                     )
                 }
-            } ?: throw fingerprint.toErrorResult()
+            } ?: throw fingerprint.exception
         }
     }
 }
diff --git a/src/main/kotlin/app/revanced/util/resources/ResourceUtils.kt b/src/main/kotlin/app/revanced/util/resources/ResourceUtils.kt
index e5305bf35..1839cd13a 100644
--- a/src/main/kotlin/app/revanced/util/resources/ResourceUtils.kt
+++ b/src/main/kotlin/app/revanced/util/resources/ResourceUtils.kt
@@ -1,17 +1,18 @@
 package app.revanced.util.resources
 
-import app.revanced.patcher.data.DomFileEditor
 import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.util.DomFileEditor
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 
-internal object ResourceUtils {
+@Suppress("MemberVisibilityCanBePrivate")
+object ResourceUtils {
     /**
      * Copy resources from the current class loader to the resource directory.
      * @param sourceResourceDirectory The source resource directory name.
      * @param resources The resources to copy.
      */
-    internal fun ResourceContext.copyResources(
+    fun ResourceContext.copyResources(
         sourceResourceDirectory: String,
         vararg resources: ResourceGroup
     ) {
@@ -35,7 +36,7 @@ internal object ResourceUtils {
      * @param resourceDirectoryName The name of the directory of the resource.
      * @param resources A list of resource names.
      */
-    internal class ResourceGroup(val resourceDirectoryName: String, vararg val resources: String)
+    class ResourceGroup(val resourceDirectoryName: String, vararg val resources: String)
 
     /**
      * Copy resources from the current class loader to the resource directory.
@@ -43,7 +44,7 @@ internal object ResourceUtils {
      * @param targetResource The target resource.
      * @param elementTag The element to copy.
      */
-    internal fun ResourceContext.copyXmlNode(
+    fun ResourceContext.copyXmlNode(
         resourceDirectory: String,
         targetResource: String,
         elementTag: String
@@ -64,7 +65,7 @@ internal object ResourceUtils {
      * @param target the target [DomFileEditor]-
      * @return AutoCloseable that closes the target [DomFileEditor]s.
      */
-    internal fun String.copyXmlNode(source: DomFileEditor, target: DomFileEditor): AutoCloseable {
+    fun String.copyXmlNode(source: DomFileEditor, target: DomFileEditor): AutoCloseable {
         val hostNodes = source.file.getElementsByTagName(this).item(0).childNodes
 
         val destinationResourceFile = target.file