From df9fb5bd6b0bce5f6e1af71bf2635cf40f81eb3e Mon Sep 17 00:00:00 2001
From: Philipp Hofmann <philipp.hofmann@sentry.io>
Date: Tue, 29 Oct 2024 14:40:12 +0100
Subject: [PATCH] feat: Option for uncaught NSExceptions on macOS (#4471)

Add a new option, enableReportingUncaughtExceptions, for reporting
uncaught exceptions on macOS. AS SwiftUI applications on macOS can't
easily set a Principal class in the Info.plist, especially when using
the NSApplicationDelegate, our existing solution of the
SentryCrashExceptionApplication doesn't work for them. This new option
fixes that problem.
---
 CHANGELOG.md                                  |  3 +-
 .../macOS-Swift/macOS-Swift/AppDelegate.swift |  3 +-
 .../macOS-Swift/Base.lproj/Main.storyboard    | 46 ++++++++---
 Samples/macOS-Swift/macOS-Swift/CppWrapper.h  |  1 +
 Samples/macOS-Swift/macOS-Swift/CppWrapper.m  |  6 ++
 Samples/macOS-Swift/macOS-Swift/Info.plist    |  2 +-
 .../macOS-Swift/ViewController.swift          | 14 +++-
 .../macOS-SwiftUI/ContentView.swift           | 22 ++++--
 .../macOS-SwiftUI/macOS_SwiftUIApp.swift      |  1 +
 Sentry.xcodeproj/project.pbxproj              | 18 ++++-
 SentryTestUtils/ClearTestState.swift          | 10 +++
 Sources/Sentry/Public/SentryOptions.h         | 21 +++++
 .../Sentry/SentryCrashExceptionApplication.m  | 22 +++---
 Sources/Sentry/SentryCrashIntegration.m       | 24 +++++-
 Sources/Sentry/SentryOptions.m                |  8 ++
 Sources/Sentry/SentryUncaughtNSExceptions.m   | 54 +++++++++++++
 .../include/SentryUncaughtNSExceptions.h      | 27 +++++++
 .../SentryCrashIntegrationTests.swift         | 72 +++++++++++++++++
 .../SentryUncaughtNSExceptionsTests.swift     | 77 +++++++++++++++++++
 Tests/SentryTests/SentryOptionsTest.m         |  7 ++
 .../SentryTests/SentryTests-Bridging-Header.h |  1 +
 21 files changed, 401 insertions(+), 38 deletions(-)
 create mode 100644 Sources/Sentry/SentryUncaughtNSExceptions.m
 create mode 100644 Sources/Sentry/include/SentryUncaughtNSExceptions.h
 create mode 100644 Tests/SentryTests/Integrations/SentryCrash/SentryUncaughtNSExceptionsTests.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34bb1d3c661..e00d5d51809 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,9 @@
 
 ## Unreleased
 
-### Fixes
+## Feature
 
+- Add option to report uncaught NSExceptions on macOS (#4471)
 - Build visionOS project with static Sentry SDK (#4462)
 
 ### Improvements
diff --git a/Samples/macOS-Swift/macOS-Swift/AppDelegate.swift b/Samples/macOS-Swift/macOS-Swift/AppDelegate.swift
index dddf3f9484a..cb0965a0655 100644
--- a/Samples/macOS-Swift/macOS-Swift/AppDelegate.swift
+++ b/Samples/macOS-Swift/macOS-Swift/AppDelegate.swift
@@ -5,8 +5,7 @@ import Sentry
 class AppDelegate: NSObject, NSApplicationDelegate {
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
-        UserDefaults.standard.register(defaults: ["NSApplicationCrashOnExceptions": true])
-        
+
         // Insert code here to initialize your application
         SentrySDK.start { options in
             options.dsn = "https://6cc9bae94def43cab8444a99e0031c28@o447951.ingest.sentry.io/5428557"
diff --git a/Samples/macOS-Swift/macOS-Swift/Base.lproj/Main.storyboard b/Samples/macOS-Swift/macOS-Swift/Base.lproj/Main.storyboard
index ccb9a21caaf..857c950c921 100644
--- a/Samples/macOS-Swift/macOS-Swift/Base.lproj/Main.storyboard
+++ b/Samples/macOS-Swift/macOS-Swift/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="23091" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23091"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -710,10 +710,10 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" fixedFrame="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fsa-9g-bf3">
-                                <rect key="frame" x="161" y="136" width="224" height="404"/>
+                                <rect key="frame" x="161" y="72" width="224" height="468"/>
                                 <subviews>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nAm-U5-PON">
-                                        <rect key="frame" x="44" y="377" width="136" height="32"/>
+                                        <rect key="frame" x="44" y="441" width="136" height="32"/>
                                         <buttonCell key="cell" type="push" title="Add Breadcrumb" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="zk9-d6-mm1">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -723,7 +723,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dzU-Gi-2VZ">
-                                        <rect key="frame" x="42" y="345" width="141" height="32"/>
+                                        <rect key="frame" x="42" y="409" width="141" height="32"/>
                                         <buttonCell key="cell" type="push" title="Capture Message" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="EQH-kc-eDD">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -733,7 +733,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LiD-mH-Y7l">
-                                        <rect key="frame" x="54" y="313" width="116" height="32"/>
+                                        <rect key="frame" x="54" y="377" width="116" height="32"/>
                                         <buttonCell key="cell" type="push" title="Capture Error" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Tlg-FD-XnA">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -743,7 +743,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zMq-8z-Bqi">
-                                        <rect key="frame" x="39" y="281" width="146" height="32"/>
+                                        <rect key="frame" x="39" y="345" width="146" height="32"/>
                                         <buttonCell key="cell" type="push" title="Capture Exception" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PwR-RA-ikK">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -753,7 +753,7 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ocz-Nk-ZQ2">
-                                        <rect key="frame" x="23" y="249" width="178" height="32"/>
+                                        <rect key="frame" x="23" y="313" width="178" height="32"/>
                                         <buttonCell key="cell" type="push" title="Capture User Feedback" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="nui-gg-F5o">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -763,15 +763,35 @@
                                         </connections>
                                     </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GQW-jy-1TZ">
-                                        <rect key="frame" x="34" y="217" width="156" height="32"/>
-                                        <buttonCell key="cell" type="push" title="_crashOnException:" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7rF-ep-EYR">
+                                        <rect key="frame" x="42" y="281" width="141" height="32"/>
+                                        <buttonCell key="cell" type="push" title="raiseNSException" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="7rF-ep-EYR">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
                                             <connections>
-                                                <action selector="crashOnException:" target="XfG-lQ-9wD" id="6mx-hG-Prh"/>
+                                                <action selector="raiseNSException:" target="XfG-lQ-9wD" id="6mx-hG-Prh"/>
                                             </connections>
                                         </buttonCell>
                                     </button>
+                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TkR-L2-cU3" userLabel="reportNSException">
+                                        <rect key="frame" x="38" y="249" width="149" height="32"/>
+                                        <buttonCell key="cell" type="push" title="reportNSException" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="89W-TG-dLd">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <action selector="reportNSException:" target="XfG-lQ-9wD" id="aAF-y5-R3W"/>
+                                        </connections>
+                                    </button>
+                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HXP-Is-MDM">
+                                        <rect key="frame" x="37" y="217" width="150" height="32"/>
+                                        <buttonCell key="cell" type="push" title="NSRangeException" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="f0L-i6-NLd">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <action selector="throwNSRangeException:" target="XfG-lQ-9wD" id="VqV-4q-Tzd"/>
+                                        </connections>
+                                    </button>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="c5W-zA-19P">
                                         <rect key="frame" x="37" y="185" width="150" height="32"/>
                                         <buttonCell key="cell" type="push" title="captureTransaction" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="OVU-vi-LRM">
@@ -857,6 +877,8 @@
                                     <integer value="1000"/>
                                     <integer value="1000"/>
                                     <integer value="1000"/>
+                                    <integer value="1000"/>
+                                    <integer value="1000"/>
                                 </visibilityPriorities>
                                 <customSpacing>
                                     <real value="3.4028234663852886e+38"/>
@@ -872,6 +894,8 @@
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
                                     <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
+                                    <real value="3.4028234663852886e+38"/>
                                 </customSpacing>
                             </stackView>
                         </subviews>
diff --git a/Samples/macOS-Swift/macOS-Swift/CppWrapper.h b/Samples/macOS-Swift/macOS-Swift/CppWrapper.h
index 10415ed6ddb..9b0ce052e97 100644
--- a/Samples/macOS-Swift/macOS-Swift/CppWrapper.h
+++ b/Samples/macOS-Swift/macOS-Swift/CppWrapper.h
@@ -3,4 +3,5 @@
 @interface CppWrapper : NSObject
 - (void)throwCPPException;
 - (void)rethrowNoActiveCPPException;
+- (void)throwNSRangeException;
 @end
diff --git a/Samples/macOS-Swift/macOS-Swift/CppWrapper.m b/Samples/macOS-Swift/macOS-Swift/CppWrapper.m
index 683c81f30d9..0e738fb0b72 100644
--- a/Samples/macOS-Swift/macOS-Swift/CppWrapper.m
+++ b/Samples/macOS-Swift/macOS-Swift/CppWrapper.m
@@ -16,4 +16,10 @@ - (void)rethrowNoActiveCPPException
     cppTool.rethrowNoActiveCPPException();
 }
 
+- (void)throwNSRangeException
+{
+    NSArray *array = [NSArray array];
+    NSLog(@"%@", array[9]);
+}
+
 @end
diff --git a/Samples/macOS-Swift/macOS-Swift/Info.plist b/Samples/macOS-Swift/macOS-Swift/Info.plist
index ff1c3e6cca4..5f1b0ec1652 100644
--- a/Samples/macOS-Swift/macOS-Swift/Info.plist
+++ b/Samples/macOS-Swift/macOS-Swift/Info.plist
@@ -33,7 +33,7 @@
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
+	<string>SentryCrashExceptionApplication</string>
 	<key>NSSupportsAutomaticTermination</key>
 	<true/>
 	<key>NSSupportsSuddenTermination</key>
diff --git a/Samples/macOS-Swift/macOS-Swift/ViewController.swift b/Samples/macOS-Swift/macOS-Swift/ViewController.swift
index 9bfafbfb0da..9692b9032ad 100644
--- a/Samples/macOS-Swift/macOS-Swift/ViewController.swift
+++ b/Samples/macOS-Swift/macOS-Swift/ViewController.swift
@@ -48,12 +48,22 @@ class ViewController: NSViewController {
         SentrySDK.capture(userFeedback: userFeedback)
     }
 
-    @IBAction func crashOnException(_ sender: Any) {
+    @IBAction func raiseNSException(_ sender: Any) {
         let userInfo: [String: String] = ["user-info-key-1": "user-info-value-1", "user-info-key-2": "user-info-value-2"]
-        let exception = NSException(name: NSExceptionName("My Custom exception"), reason: "User clicked the button", userInfo: userInfo)
+        let exception = NSException(name: NSExceptionName("NSException via NSException raise"), reason: "Raised NSException", userInfo: userInfo)
+        exception.raise()
+    }
+    
+    @IBAction func reportNSException(_ sender: Any) {
+        let userInfo: [String: String] = ["user-info-key-1": "user-info-value-1", "user-info-key-2": "user-info-value-2"]
+        let exception = NSException(name: NSExceptionName("NSException via NSApplication report"), reason: "It doesn't work", userInfo: userInfo)
         NSApplication.shared.reportException(exception)
     }
     
+    @IBAction func throwNSRangeException(_ sender: Any) {
+        CppWrapper().throwNSRangeException()
+    }
+    
     @IBAction func captureTransaction(_ sender: Any) {
         let transaction = SentrySDK.startTransaction(name: "Some Transaction", operation: "some operation")
         DispatchQueue.main.asyncAfter(deadline: .now() + Double.random(in: 0.4...0.6), execute: {
diff --git a/Samples/macOS-SwiftUI/macOS-SwiftUI/ContentView.swift b/Samples/macOS-SwiftUI/macOS-SwiftUI/ContentView.swift
index 7d97eeef5af..23b36d3e90c 100644
--- a/Samples/macOS-SwiftUI/macOS-SwiftUI/ContentView.swift
+++ b/Samples/macOS-SwiftUI/macOS-SwiftUI/ContentView.swift
@@ -8,8 +8,12 @@ struct ContentView: View {
                 Text("Capture Error")
             }
             
-            Button(action: uncaughtNSException) {
-                Text("Uncaught NSException")
+            Button(action: raiseNSException) {
+                Text("Raise NSException")
+            }
+            
+            Button(action: reportNSException) {
+                Text("Report NSException")
             }
             
             Button(action: crash) {
@@ -24,10 +28,16 @@ struct ContentView: View {
         SentrySDK.capture(error: error)
     }
     
-    func uncaughtNSException() {
-        NSException(name: NSExceptionName(rawValue: "ExplodingPotato"),
-                    reason: "Potato is exploding!",
-                    userInfo: nil).raise()
+    func raiseNSException() {
+        let userInfo: [String: String] = ["user-info-key-1": "user-info-value-1", "user-info-key-2": "user-info-value-2"]
+        let exception = NSException(name: NSExceptionName("NSException via NSException raise"), reason: "Raised NSException", userInfo: userInfo)
+        exception.raise()
+    }
+    
+    func reportNSException() {
+        let userInfo: [String: String] = ["user-info-key-1": "user-info-value-1", "user-info-key-2": "user-info-value-2"]
+        let exception = NSException(name: NSExceptionName("NSException via NSApplication report"), reason: "It doesn't work", userInfo: userInfo)
+        NSApplication.shared.reportException(exception)
     }
     
     func crash() {
diff --git a/Samples/macOS-SwiftUI/macOS-SwiftUI/macOS_SwiftUIApp.swift b/Samples/macOS-SwiftUI/macOS-SwiftUI/macOS_SwiftUIApp.swift
index 355ca0b1507..3b1770fca27 100644
--- a/Samples/macOS-SwiftUI/macOS-SwiftUI/macOS_SwiftUIApp.swift
+++ b/Samples/macOS-SwiftUI/macOS-SwiftUI/macOS_SwiftUIApp.swift
@@ -21,6 +21,7 @@ class MyAppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
             options.debug = true
             options.tracesSampleRate = 1.0
             options.profilesSampleRate = 1.0
+            options.enableUncaughtNSExceptionReporting = true
         }
     }
     
diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj
index 77a3bc9c69c..80de2dcf549 100644
--- a/Sentry.xcodeproj/project.pbxproj
+++ b/Sentry.xcodeproj/project.pbxproj
@@ -114,10 +114,13 @@
 		62C316812B1F2E93000D7031 /* SentryDelayedFramesTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 62C316802B1F2E93000D7031 /* SentryDelayedFramesTracker.h */; };
 		62C316832B1F2EA1000D7031 /* SentryDelayedFramesTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 62C316822B1F2EA1000D7031 /* SentryDelayedFramesTracker.m */; };
 		62C3168B2B1F865A000D7031 /* SentryTimeSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62C3168A2B1F865A000D7031 /* SentryTimeSwiftTests.swift */; };
+		62C97D382CC64E4900DDA204 /* SentryUncaughtNSExceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 62C97D372CC64E4900DDA204 /* SentryUncaughtNSExceptions.h */; };
+		62C97D3A2CC64E6B00DDA204 /* SentryUncaughtNSExceptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 62C97D392CC64E6B00DDA204 /* SentryUncaughtNSExceptions.m */; };
 		62CFD9A92C99741100834E1B /* SentryInvalidJSONStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62CFD9A82C99741100834E1B /* SentryInvalidJSONStringTests.swift */; };
 		62CFD9AB2C9976E700834E1B /* SentryInvalidJSONString.h in Headers */ = {isa = PBXBuildFile; fileRef = 62CFD9AA2C9976E700834E1B /* SentryInvalidJSONString.h */; };
 		62CFD9AD2C99770B00834E1B /* SentryInvalidJSONString.m in Sources */ = {isa = PBXBuildFile; fileRef = 62CFD9AC2C99770B00834E1B /* SentryInvalidJSONString.m */; };
 		62CFD9AE2C99770B00834E1B /* SentryInvalidJSONString.m in Sources */ = {isa = PBXBuildFile; fileRef = 62CFD9AC2C99770B00834E1B /* SentryInvalidJSONString.m */; };
+		62D6B2A72CCA354B004DDBF1 /* SentryUncaughtNSExceptionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62D6B2A62CCA354B004DDBF1 /* SentryUncaughtNSExceptionsTests.swift */; };
 		62E081A929ED4260000F69FC /* SentryBreadcrumbDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 62E081A829ED4260000F69FC /* SentryBreadcrumbDelegate.h */; };
 		62E081AB29ED4322000F69FC /* SentryBreadcrumbTestDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E081AA29ED4322000F69FC /* SentryBreadcrumbTestDelegate.swift */; };
 		62EF86A12C626D39004E058B /* SentryANRTrackerV2Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 621AE74E2C626CF70012E730 /* SentryANRTrackerV2Tests.swift */; };
@@ -1106,9 +1109,12 @@
 		62C316802B1F2E93000D7031 /* SentryDelayedFramesTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDelayedFramesTracker.h; path = include/SentryDelayedFramesTracker.h; sourceTree = "<group>"; };
 		62C316822B1F2EA1000D7031 /* SentryDelayedFramesTracker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDelayedFramesTracker.m; sourceTree = "<group>"; };
 		62C3168A2B1F865A000D7031 /* SentryTimeSwiftTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryTimeSwiftTests.swift; sourceTree = "<group>"; };
+		62C97D372CC64E4900DDA204 /* SentryUncaughtNSExceptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryUncaughtNSExceptions.h; path = include/SentryUncaughtNSExceptions.h; sourceTree = "<group>"; };
+		62C97D392CC64E6B00DDA204 /* SentryUncaughtNSExceptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryUncaughtNSExceptions.m; sourceTree = "<group>"; };
 		62CFD9A82C99741100834E1B /* SentryInvalidJSONStringTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryInvalidJSONStringTests.swift; sourceTree = "<group>"; };
 		62CFD9AA2C9976E700834E1B /* SentryInvalidJSONString.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SentryInvalidJSONString.h; sourceTree = "<group>"; };
 		62CFD9AC2C99770B00834E1B /* SentryInvalidJSONString.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryInvalidJSONString.m; sourceTree = "<group>"; };
+		62D6B2A62CCA354B004DDBF1 /* SentryUncaughtNSExceptionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUncaughtNSExceptionsTests.swift; sourceTree = "<group>"; };
 		62E081A829ED4260000F69FC /* SentryBreadcrumbDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryBreadcrumbDelegate.h; path = include/SentryBreadcrumbDelegate.h; sourceTree = "<group>"; };
 		62E081AA29ED4322000F69FC /* SentryBreadcrumbTestDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryBreadcrumbTestDelegate.swift; sourceTree = "<group>"; };
 		62F05D292C0DB1C800916E3F /* SentryLogTestHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SentryLogTestHelper.h; sourceTree = "<group>"; };
@@ -2089,8 +2095,8 @@
 			isa = PBXGroup;
 			children = (
 				D8739CF62BECFF86007D2F66 /* Log */,
-				621D9F2E2B9B0320003D94DE /* SentryCurrentDateProvider.swift */,
 				621F61F02BEA073A005E654F /* SentryEnabledFeaturesBuilder.swift */,
+				621D9F2E2B9B0320003D94DE /* SentryCurrentDateProvider.swift */,
 				624688182C048EF10006179C /* SentryBaggageSerialization.swift */,
 				620203B12C59025E0008317C /* SentryFileContents.swift */,
 			);
@@ -2309,6 +2315,8 @@
 		6344DDB61EC3113C00D9160D /* SentryCrash */ = {
 			isa = PBXGroup;
 			children = (
+				632F434E1F581D5400A18A36 /* SentryCrashExceptionApplication.h */,
+				632F434F1F581D5400A18A36 /* SentryCrashExceptionApplication.m */,
 				6344DDAE1EC308E400D9160D /* SentryCrashInstallationReporter.h */,
 				6344DDAF1EC308E400D9160D /* SentryCrashInstallationReporter.m */,
 				6344DDB21EC309E000D9160D /* SentryCrashReportSink.h */,
@@ -2339,6 +2347,8 @@
 				7B7A30C724B48389005A4C6E /* SentryCrashWrapper.m */,
 				0ADC33ED28D9BB890078D980 /* SentryUIDeviceWrapper.h */,
 				0ADC33EB28D9BB780078D980 /* SentryUIDeviceWrapper.m */,
+				62C97D372CC64E4900DDA204 /* SentryUncaughtNSExceptions.h */,
+				62C97D392CC64E6B00DDA204 /* SentryUncaughtNSExceptions.m */,
 			);
 			name = SentryCrash;
 			sourceTree = "<group>";
@@ -2412,8 +2422,6 @@
 				639889BA1EDED18400EA7442 /* SentrySwizzle.m */,
 				7BC63F0728081242009D9E37 /* SentrySwizzleWrapper.h */,
 				7BC63F0928081288009D9E37 /* SentrySwizzleWrapper.m */,
-				632F434E1F581D5400A18A36 /* SentryCrashExceptionApplication.h */,
-				632F434F1F581D5400A18A36 /* SentryCrashExceptionApplication.m */,
 				7BD729952463E83300EA3610 /* SentryDateUtil.h */,
 				7BD729972463E93500EA3610 /* SentryDateUtil.m */,
 				7B98D7E325FB7A7200C5A389 /* SentryAppState.h */,
@@ -3230,6 +3238,7 @@
 				7B4E23AE2519E13800060D68 /* SentryCrashIntegration+TestInit.h */,
 				7BE2C7F625700093003B66C7 /* SentryTestIntegration.h */,
 				7BE2C7F72570009F003B66C7 /* SentryTestIntegration.m */,
+				62D6B2A62CCA354B004DDBF1 /* SentryUncaughtNSExceptionsTests.swift */,
 			);
 			path = SentryCrash;
 			sourceTree = "<group>";
@@ -3960,6 +3969,7 @@
 				03F84D2227DD414C008FE43F /* SentryStackFrame.hpp in Headers */,
 				8ECC673E25C23996000E2BF6 /* SentrySpanContext.h in Headers */,
 				8ECC674025C23996000E2BF6 /* SentryTransactionContext.h in Headers */,
+				62C97D382CC64E4900DDA204 /* SentryUncaughtNSExceptions.h in Headers */,
 				D8CB74152947246600A5F964 /* SentryEnvelopeAttachmentHeader.h in Headers */,
 				63FE71BA20DA4C1100CDBAE8 /* SentryCrashInstallation+Private.h in Headers */,
 				63FE71AE20DA4C1100CDBAE8 /* SentryCrashInstallation.h in Headers */,
@@ -4544,6 +4554,7 @@
 				8ECC674A25C23A20000E2BF6 /* SentryTransactionContext.mm in Sources */,
 				03BCC38C27E1C01A003232C7 /* SentryTime.mm in Sources */,
 				A8F17B342902870300990B25 /* SentryHttpStatusCodeRange.m in Sources */,
+				62C97D3A2CC64E6B00DDA204 /* SentryUncaughtNSExceptions.m in Sources */,
 				03F84D3727DD4191008FE43F /* SentrySamplingProfiler.cpp in Sources */,
 				8453421628BE8A9500C22EEC /* SentrySpanStatus.m in Sources */,
 				7B08A3472924CF9C0059603A /* SentryMetricKitIntegration.m in Sources */,
@@ -5016,6 +5027,7 @@
 				7BF536D424BEF255004FA6A2 /* SentryAssertions.swift in Sources */,
 				7BC6EC14255C415E0059822A /* SentryExceptionTests.swift in Sources */,
 				7B82722927A319E900F4BFF4 /* SentryAutoSessionTrackingIntegrationTests.swift in Sources */,
+				62D6B2A72CCA354B004DDBF1 /* SentryUncaughtNSExceptionsTests.swift in Sources */,
 				D875ED0B276CC84700422FAC /* SentryNSDataTrackerTests.swift in Sources */,
 				62B86CFC29F052BB008F3947 /* SentryTestLogConfig.m in Sources */,
 				D808FB92281BF6EC009A2A33 /* SentryUIEventTrackingIntegrationTests.swift in Sources */,
diff --git a/SentryTestUtils/ClearTestState.swift b/SentryTestUtils/ClearTestState.swift
index c6d346f34ee..36ec3b75773 100644
--- a/SentryTestUtils/ClearTestState.swift
+++ b/SentryTestUtils/ClearTestState.swift
@@ -5,6 +5,16 @@ public func clearTestState() {
     TestCleanup.clearTestState()
 }
 
+public func resetUserDefaults() {
+    if let appDomain = Bundle.main.bundleIdentifier {
+        UserDefaults.standard.removePersistentDomain(forName: appDomain)
+        // Although the Apple docs state this shouldn't be used we need it
+        // to avoid race conditions in tests for UserDefaults. Not calling
+        // this can lead to flaky tests.
+        UserDefaults.standard.synchronize()
+    }
+}
+
 @objcMembers
 class TestCleanup: NSObject {
     static func clearTestState() {
diff --git a/Sources/Sentry/Public/SentryOptions.h b/Sources/Sentry/Public/SentryOptions.h
index bb67691dccd..0a053c418e8 100644
--- a/Sources/Sentry/Public/SentryOptions.h
+++ b/Sources/Sentry/Public/SentryOptions.h
@@ -80,6 +80,27 @@ NS_SWIFT_NAME(Options)
  */
 @property (nonatomic, assign) BOOL enableCrashHandler;
 
+#if TARGET_OS_OSX
+
+/**
+ * When enabled, the SDK captures uncaught NSExceptions. As this feature uses swizzling, disabling
+ * @c enableSwizzling also disables this feature.
+ *
+ * @discussion This option registers the `NSApplicationCrashOnExceptions` UserDefault,
+ * so your macOS application crashes when an uncaught exception occurs. As the Cocoa Frameworks are
+ * generally not exception-safe on macOS, we recommend this approach because the application could
+ * otherwise end up in a corrupted state.
+ *
+ * @warning Don't use this in combination with `SentryCrashExceptionApplication`. Either enable this
+ * feature or use the `SentryCrashExceptionApplication`. Having both enabled can lead to duplicated
+ * reports.
+ *
+ * @note Default value is @c NO .
+ */
+@property (nonatomic, assign) BOOL enableUncaughtNSExceptionReporting;
+
+#endif // TARGET_OS_OSX
+
 #if !TARGET_OS_WATCH
 
 /**
diff --git a/Sources/Sentry/SentryCrashExceptionApplication.m b/Sources/Sentry/SentryCrashExceptionApplication.m
index c1da077747f..576ece81bfb 100644
--- a/Sources/Sentry/SentryCrashExceptionApplication.m
+++ b/Sources/Sentry/SentryCrashExceptionApplication.m
@@ -1,16 +1,18 @@
-#import "SentryCrashExceptionApplication.h"
-#import "SentryCrash.h"
-#import "SentryDependencyContainer.h"
-#import "SentrySDK.h"
-
-@implementation SentryCrashExceptionApplication
+#import <Foundation/Foundation.h>
 
 #if TARGET_OS_OSX
 
+#    import "SentryCrash.h"
+#    import "SentryCrashExceptionApplication.h"
+#    import "SentryDependencyContainer.h"
+#    import "SentrySDK.h"
+#    import "SentryUncaughtNSExceptions.h"
+
+@implementation SentryCrashExceptionApplication
+
 - (void)reportException:(NSException *)exception
 {
-    [[NSUserDefaults standardUserDefaults]
-        registerDefaults:@{ @"NSApplicationCrashOnExceptions" : @YES }];
+    [SentryUncaughtNSExceptions configureCrashOnExceptions];
     SentryCrash *crash = SentryDependencyContainer.sharedInstance.crashReporter;
     if (nil != crash.uncaughtExceptionHandler && nil != exception) {
         crash.uncaughtExceptionHandler(exception);
@@ -24,6 +26,6 @@ - (void)_crashOnException:(NSException *)exception
     abort();
 }
 
-#endif
-
 @end
+
+#endif // TARGET_OS_OSX
diff --git a/Sources/Sentry/SentryCrashIntegration.m b/Sources/Sentry/SentryCrashIntegration.m
index bc80ddee8c7..37e5ef99c0b 100644
--- a/Sources/Sentry/SentryCrashIntegration.m
+++ b/Sources/Sentry/SentryCrashIntegration.m
@@ -24,6 +24,10 @@
 #    import <UIKit/UIKit.h>
 #endif
 
+#if TARGET_OS_OSX
+#    import "SentryUncaughtNSExceptions.h"
+#endif // TARGET_OS_OSX
+
 static dispatch_once_t installationToken = 0;
 static SentryCrashInstallationReporter *installation = nil;
 
@@ -93,8 +97,16 @@ - (BOOL)installWithOptions:(nonnull SentryOptions *)options
     enableSigtermReporting = options.enableSigtermReporting;
 #endif // !TARGET_OS_WATCH
 
+    BOOL enableUncaughtNSExceptionReporting = NO;
+#if TARGET_OS_OSX
+    if (options.enableSwizzling) {
+        enableUncaughtNSExceptionReporting = options.enableUncaughtNSExceptionReporting;
+    }
+#endif // TARGET_OS_OSX
+
     [self startCrashHandler:options.cacheDirectoryPath
-        enableSigtermReporting:enableSigtermReporting];
+                   enableSigtermReporting:enableSigtermReporting
+        enableReportingUncaughtExceptions:enableUncaughtNSExceptionReporting];
 
     [self configureScope];
 
@@ -107,7 +119,8 @@ - (SentryIntegrationOption)integrationOptions
 }
 
 - (void)startCrashHandler:(NSString *)cacheDirectory
-    enableSigtermReporting:(BOOL)enableSigtermReporting
+               enableSigtermReporting:(BOOL)enableSigtermReporting
+    enableReportingUncaughtExceptions:(BOOL)enableReportingUncaughtExceptions
 {
     void (^block)(void) = ^{
         BOOL canSendReports = NO;
@@ -128,6 +141,13 @@ - (void)startCrashHandler:(NSString *)cacheDirectory
 
         [installation install:cacheDirectory];
 
+#if TARGET_OS_OSX
+        if (enableReportingUncaughtExceptions) {
+            [SentryUncaughtNSExceptions configureCrashOnExceptions];
+            [SentryUncaughtNSExceptions swizzleNSApplicationReportException];
+        }
+#endif // TARGET_OS_OSX
+
         // We need to send the crashed event together with the crashed session in the same envelope
         // to have proper statistics in release health. To achieve this we need both synchronously
         // in the hub. The crashed event is converted from a SentryCrashReport to an event in
diff --git a/Sources/Sentry/SentryOptions.m b/Sources/Sentry/SentryOptions.m
index b80be215d0a..72e3de6866f 100644
--- a/Sources/Sentry/SentryOptions.m
+++ b/Sources/Sentry/SentryOptions.m
@@ -84,6 +84,9 @@ - (instancetype)init
         self.enabled = YES;
         self.shutdownTimeInterval = 2.0;
         self.enableCrashHandler = YES;
+#if TARGET_OS_OSX
+        self.enableUncaughtNSExceptionReporting = NO;
+#endif // TARGET_OS_OSX
 #if !TARGET_OS_WATCH
         self.enableSigtermReporting = NO;
 #endif // !TARGET_OS_WATCH
@@ -316,6 +319,11 @@ - (BOOL)validateOptions:(NSDictionary<NSString *, id> *)options
     [self setBool:options[@"enableCrashHandler"]
             block:^(BOOL value) { self->_enableCrashHandler = value; }];
 
+#if TARGET_OS_OSX
+    [self setBool:options[@"enableUncaughtNSExceptionReporting"]
+            block:^(BOOL value) { self->_enableUncaughtNSExceptionReporting = value; }];
+#endif // TARGET_OS_OSX
+
 #if !TARGET_OS_WATCH
     [self setBool:options[@"enableSigtermReporting"]
             block:^(BOOL value) { self->_enableSigtermReporting = value; }];
diff --git a/Sources/Sentry/SentryUncaughtNSExceptions.m b/Sources/Sentry/SentryUncaughtNSExceptions.m
new file mode 100644
index 00000000000..5ea809f2395
--- /dev/null
+++ b/Sources/Sentry/SentryUncaughtNSExceptions.m
@@ -0,0 +1,54 @@
+#import <Foundation/Foundation.h>
+
+#if TARGET_OS_OSX
+
+#    import "SentryCrash.h"
+#    import "SentryDependencyContainer.h"
+#    import "SentrySwizzle.h"
+#    import "SentryUncaughtNSExceptions.h"
+#    import <AppKit/NSApplication.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@implementation SentryUncaughtNSExceptions
+
++ (void)configureCrashOnExceptions
+{
+    [[NSUserDefaults standardUserDefaults]
+        registerDefaults:@{ @"NSApplicationCrashOnExceptions" : @YES }];
+}
+
++ (void)swizzleNSApplicationReportException
+{
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wshadow"
+    SEL selector = NSSelectorFromString(@"reportException:");
+    SentrySwizzleInstanceMethod(NSApplication, selector, SentrySWReturnType(void),
+        SentrySWArguments(NSException * exception), SentrySWReplacement({
+            [SentryUncaughtNSExceptions capture:exception];
+            return SentrySWCallOriginal(exception);
+        }),
+        SentrySwizzleModeOncePerClassAndSuperclasses, (void *)selector);
+#    pragma clang diagnostic pop
+}
+
++ (void)capture:(nullable NSException *)exception
+{
+    SentryCrash *crash = SentryDependencyContainer.sharedInstance.crashReporter;
+
+    if (crash.uncaughtExceptionHandler == nil) {
+        return;
+    }
+
+    if (exception == nil) {
+        return;
+    }
+
+    crash.uncaughtExceptionHandler(exception);
+}
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // TARGET_OS_OSX
diff --git a/Sources/Sentry/include/SentryUncaughtNSExceptions.h b/Sources/Sentry/include/SentryUncaughtNSExceptions.h
new file mode 100644
index 00000000000..8ff833c98d6
--- /dev/null
+++ b/Sources/Sentry/include/SentryUncaughtNSExceptions.h
@@ -0,0 +1,27 @@
+#import <Foundation/Foundation.h>
+
+#if TARGET_OS_OSX
+
+#    import "SentryDefines.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SentryUncaughtNSExceptions : NSObject
+
+/**
+ * This method will force the application to crash when an uncaught exception occurs. We recommended
+ * this approach cause otherwise, the application can end up in a corrupted state because the Cocoa
+ * Frameworks are generally not exception-safe:
+ * https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/Exceptions/Articles/ExceptionsAndCocoaFrameworks.html.
+ */
++ (void)configureCrashOnExceptions;
+
++ (void)swizzleNSApplicationReportException;
+
++ (void)capture:(nullable NSException *)exception;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // TARGET_OS_OSX
diff --git a/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift b/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift
index f41d21abcfc..f38bb3fd533 100644
--- a/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift
+++ b/Tests/SentryTests/Integrations/SentryCrash/SentryCrashIntegrationTests.swift
@@ -264,6 +264,78 @@ class SentryCrashIntegrationTests: NotificationCenterTestCase {
         api?.pointee.setEnabled(false)
     }
     
+#if os(macOS)
+    
+    func testUncaughtExceptions_Enabled() throws {
+        defer { resetUserDefaults() }
+        
+        let (sut, _) = givenSutWithGlobalHubAndCrashWrapper()
+        let options = Options()
+        options.enableUncaughtNSExceptionReporting = true
+        sut.install(with: options)
+        
+        XCTAssertTrue(UserDefaults.standard.bool(forKey: "NSApplicationCrashOnExceptions"))
+        // We have to set the flat to false, cause otherwise we would crash
+        UserDefaults.standard.set(false, forKey: "NSApplicationCrashOnExceptions")
+        
+        let crashReporter = SentryDependencyContainer.sharedInstance().crashReporter
+        
+        defer {
+            crashReporter.uncaughtExceptionHandler = nil
+            wasUncaughtExceptionHandlerCalled = false
+        }
+        crashReporter.uncaughtExceptionHandler = uncaughtExceptionHandler
+        
+        NSApplication.shared.reportException(uncaughtInternalInconsistencyException)
+        XCTAssertTrue(wasUncaughtExceptionHandlerCalled)
+    }
+    
+    func testUncaughtExceptions_Enabled_ButSwizzlingDisabled() throws {
+        defer { resetUserDefaults() }
+        
+        let (sut, _) = givenSutWithGlobalHubAndCrashWrapper()
+        let options = Options()
+        options.enableUncaughtNSExceptionReporting = true
+        options.enableSwizzling = false
+        sut.install(with: options)
+        
+        XCTAssertFalse(UserDefaults.standard.bool(forKey: "NSApplicationCrashOnExceptions"))
+        
+        let crashReporter = SentryDependencyContainer.sharedInstance().crashReporter
+        
+        defer {
+            crashReporter.uncaughtExceptionHandler = nil
+            wasUncaughtExceptionHandlerCalled = false
+        }
+        crashReporter.uncaughtExceptionHandler = uncaughtExceptionHandler
+        
+        NSApplication.shared.reportException(uncaughtInternalInconsistencyException)
+        XCTAssertFalse(wasUncaughtExceptionHandlerCalled)
+    }
+    
+    func testUncaughtExceptions_Disabled() {
+        defer { resetUserDefaults() }
+        
+        let (sut, _) = givenSutWithGlobalHubAndCrashWrapper()
+        let options = Options()
+        options.enableUncaughtNSExceptionReporting = false
+        sut.install(with: options)
+        
+        XCTAssertFalse(UserDefaults.standard.bool(forKey: "NSApplicationCrashOnExceptions"))
+        
+        let crashReporter = SentryDependencyContainer.sharedInstance().crashReporter
+        
+        defer {
+            crashReporter.uncaughtExceptionHandler = nil
+            wasUncaughtExceptionHandlerCalled = false
+        }
+        crashReporter.uncaughtExceptionHandler = uncaughtExceptionHandler
+        
+        NSApplication.shared.reportException(uncaughtInternalInconsistencyException)
+        XCTAssertFalse(wasUncaughtExceptionHandlerCalled)
+    }
+#endif // os(macOS)
+    
     private func givenCurrentSession() -> SentrySession {
         // serialize sets the timestamp
         let session = SentrySession(jsonObject: fixture.session.serialize())!
diff --git a/Tests/SentryTests/Integrations/SentryCrash/SentryUncaughtNSExceptionsTests.swift b/Tests/SentryTests/Integrations/SentryCrash/SentryUncaughtNSExceptionsTests.swift
new file mode 100644
index 00000000000..94a968af786
--- /dev/null
+++ b/Tests/SentryTests/Integrations/SentryCrash/SentryUncaughtNSExceptionsTests.swift
@@ -0,0 +1,77 @@
+import Sentry
+import SentryTestUtils
+import XCTest
+
+final class SentryUncaughtNSExceptionsTests: XCTestCase {
+
+#if os(macOS)
+    func testConfigure_SetsUserDefault() throws {
+        defer { resetUserDefaults() }
+        
+        SentryUncaughtNSExceptions.configureCrashOnExceptions()
+        
+        XCTAssertTrue(UserDefaults.standard.bool(forKey: "NSApplicationCrashOnExceptions"))
+    }
+    
+    func testSwizzleNSApplicationReportException() throws {
+        let crashReporter = SentryDependencyContainer.sharedInstance().crashReporter
+        
+        defer {
+            resetUserDefaults()
+            crashReporter.uncaughtExceptionHandler = nil
+            wasUncaughtExceptionHandlerCalled = false
+        }
+        
+        crashReporter.uncaughtExceptionHandler = uncaughtExceptionHandler
+        
+        SentryUncaughtNSExceptions.swizzleNSApplicationReportException()
+        
+        // We have to set the flat to false, cause otherwise we would crash
+        UserDefaults.standard.set(false, forKey: "NSApplicationCrashOnExceptions")
+        NSApplication.shared.reportException(uncaughtInternalInconsistencyException)
+    }
+    
+    func testCapture_ForwardsException() throws {
+        let crashReporter = SentryDependencyContainer.sharedInstance().crashReporter
+        
+        defer {
+            crashReporter.uncaughtExceptionHandler = nil
+            wasUncaughtExceptionHandlerCalled = false
+        }
+        crashReporter.uncaughtExceptionHandler = uncaughtExceptionHandler
+      
+        SentryUncaughtNSExceptions.capture(uncaughtInternalInconsistencyException)
+    }
+    
+    func testCapture_NoUncaughtExceptionHandler() throws {
+        defer { wasUncaughtExceptionHandlerCalled = false }
+        
+        SentryUncaughtNSExceptions.capture(uncaughtInternalInconsistencyException)
+        
+        XCTAssertFalse(wasUncaughtExceptionHandlerCalled)
+    }
+    
+    func testCapture_ExceptionIsNil() throws {
+        let crashReporter = SentryDependencyContainer.sharedInstance().crashReporter
+        
+        defer {
+            crashReporter.uncaughtExceptionHandler = nil
+            wasUncaughtExceptionHandlerCalled = false
+        }
+        SentryUncaughtNSExceptions.capture(nil)
+        XCTAssertFalse(wasUncaughtExceptionHandlerCalled)
+    }
+#endif // os(macOS)
+
+}
+
+// We need to declare this on the file level because otherwise we get the error:
+// A C function pointer cannot be formed from a closure that captures context.
+var wasUncaughtExceptionHandlerCalled = false
+func uncaughtExceptionHandler(exception: NSException) {
+    XCTAssertEqual(uncaughtInternalInconsistencyException.name, exception.name)
+    XCTAssertEqual(uncaughtInternalInconsistencyException.reason, exception.reason)
+    wasUncaughtExceptionHandlerCalled = true
+}
+
+let uncaughtInternalInconsistencyException = NSException(name: .internalInconsistencyException, reason: "reason", userInfo: nil)
diff --git a/Tests/SentryTests/SentryOptionsTest.m b/Tests/SentryTests/SentryOptionsTest.m
index f240fbfc961..21629bb8ee2 100644
--- a/Tests/SentryTests/SentryOptionsTest.m
+++ b/Tests/SentryTests/SentryOptionsTest.m
@@ -87,6 +87,13 @@ - (NSString *)buildDefaultReleaseName
         infoDict[@"CFBundleShortVersionString"], infoDict[@"CFBundleVersion"]];
 }
 
+#if TARGET_OS_OSX
+- (void)testEnableReportingUncaughtNSExceptions
+{
+    [self testBooleanField:@"enableUncaughtNSExceptionReporting" defaultValue:NO];
+}
+#endif // TARGET_OS_OSX
+
 - (void)testEnvironment
 {
     SentryOptions *options = [self getValidOptions:@{}];
diff --git a/Tests/SentryTests/SentryTests-Bridging-Header.h b/Tests/SentryTests/SentryTests-Bridging-Header.h
index edef509d578..a29c3704325 100644
--- a/Tests/SentryTests/SentryTests-Bridging-Header.h
+++ b/Tests/SentryTests/SentryTests-Bridging-Header.h
@@ -180,6 +180,7 @@
 #import "SentryScreenshotIntegration.h"
 #import "SentrySwift.h"
 #import "SentrySwiftAsyncIntegration.h"
+#import "SentryUncaughtNSExceptions.h"
 
 #import "Sentry/Sentry-Swift.h"
 #import "SentryBinaryImageCache+Private.h"