diff --git a/package-lock.json b/package-lock.json
index 7e12ea4b..f1b9504c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-pspdfkit",
-  "version": "1.23.4",
+  "version": "1.23.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 27679b05..6f893ebe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-pspdfkit",
-  "version": "1.23.4",
+  "version": "1.23.5",
   "description": "A React Native module for the PSPDFKit library.",
   "keywords": [
     "react native",
diff --git a/samples/Catalog/Catalog.windows.js b/samples/Catalog/Catalog.windows.js
index a56d54f6..f5097dfa 100644
--- a/samples/Catalog/Catalog.windows.js
+++ b/samples/Catalog/Catalog.windows.js
@@ -441,7 +441,9 @@ class PdfViewToolbarCustomizationScreen extends Component<{}> {
             </View>
             <View style={styles.button}>
               <Button onPress={() =>
-                this.refs.pdfView.setToolbarItems([{type: "ink"}])} title="Set Toolbar Items"/>
+                this.refs.pdfView.setToolbarItems([{type: "ink"}]).then(() => {
+                  alert("Toolbar Items set.");
+                })} title="Set Toolbar Items"/>
             </View>
           </View>
           <Image
diff --git a/samples/Catalog/package.json b/samples/Catalog/package.json
index 252046ff..6a8a8df2 100644
--- a/samples/Catalog/package.json
+++ b/samples/Catalog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Catalog",
-  "version": "1.23.4",
+  "version": "1.23.5",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start"
diff --git a/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PDFViewPage.xaml.cs b/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PDFViewPage.xaml.cs
index 21ed4e76..42b80cb1 100644
--- a/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PDFViewPage.xaml.cs
+++ b/windows/ReactNativePSPDFKit/ReactNativePSPDFKit/PDFViewPage.xaml.cs
@@ -138,18 +138,14 @@ internal void GetToolbarItems(int requestId)
 
         internal async Task SetToolbarItems(int requestId, string toolbarItemsJson)
         {
-            try
-            {
-                var toolbarItems =
-                    PSPDFKit.UI.ToolbarComponents.Factory.FromJsonArray(JsonArray.Parse(toolbarItemsJson));
-                await Pdfview.Controller.SetToolbarItemsAsync(toolbarItems.ToList());
-            }
-            catch (Exception e)
-            {
-                this.GetReactContext().GetNativeModule<UIManagerModule>().EventDispatcher.DispatchEvent(
-                    new PdfViewDataReturnedEvent(this.GetTag(), requestId, e.Message)
-                );
-            }
+            await RunOperationAndFireEvent(requestId,
+                async () =>
+                {
+                    var toolbarItems =
+                        PSPDFKit.UI.ToolbarComponents.Factory.FromJsonArray(JsonArray.Parse(toolbarItemsJson));
+                    await Pdfview.Controller.SetToolbarItemsAsync(toolbarItems.ToList());
+                }
+            );
         }
 
         internal async Task CreateAnnotation(int requestId, string annotationJsonString)