diff --git a/Tactility/Source/app/addgps/AddGps.cpp b/Tactility/Source/app/addgps/AddGps.cpp
index 0900a7421..03448dd9f 100644
--- a/Tactility/Source/app/addgps/AddGps.cpp
+++ b/Tactility/Source/app/addgps/AddGps.cpp
@@ -11,6 +11,7 @@
 
 #include <lvgl/icons/shared.h>
 #include <lvgl/widgets/toolbar.h>
+#include <tactility/check.h>
 #include <tactility/drivers/uart_controller.h>
 #include <tactility/log.h>
 
@@ -209,7 +210,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -234,7 +235,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/alertdialog/AlertDialog.cpp b/Tactility/Source/app/alertdialog/AlertDialog.cpp
index 3ea99142f..88c31a4cd 100644
--- a/Tactility/Source/app/alertdialog/AlertDialog.cpp
+++ b/Tactility/Source/app/alertdialog/AlertDialog.cpp
@@ -7,6 +7,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <lvgl.h>
@@ -108,7 +109,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -127,7 +128,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return ctx.result;
diff --git a/Tactility/Source/app/appdetails/AppDetails.cpp b/Tactility/Source/app/appdetails/AppDetails.cpp
index d7adc3f98..c919d1305 100644
--- a/Tactility/Source/app/appdetails/AppDetails.cpp
+++ b/Tactility/Source/app/appdetails/AppDetails.cpp
@@ -16,6 +16,7 @@
 #include <Tactility/file/File.h>
 #include <Tactility/lvgl/Style.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 constexpr auto* TAG = "AppDetails";
@@ -120,7 +121,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -151,7 +152,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/apphub/AppHubApp.cpp b/Tactility/Source/app/apphub/AppHubApp.cpp
index 8fd5a0a79..5f1910f43 100644
--- a/Tactility/Source/app/apphub/AppHubApp.cpp
+++ b/Tactility/Source/app/apphub/AppHubApp.cpp
@@ -14,6 +14,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <lvgl/lvgl.h>
@@ -207,7 +208,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create_ext(appInstanceId, createWidgets, destroyWidgets, &ctx);
 
@@ -229,7 +230,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp b/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp
index 4c4f9d2d7..495281228 100644
--- a/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp
+++ b/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp
@@ -18,6 +18,7 @@
 #include <lvgl/lvgl.h>
 #include <lvgl/widgets/toolbar.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <atomic>
@@ -236,7 +237,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -270,7 +271,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/applist/AppList.cpp b/Tactility/Source/app/applist/AppList.cpp
index 7eba66616..cdab48a42 100644
--- a/Tactility/Source/app/applist/AppList.cpp
+++ b/Tactility/Source/app/applist/AppList.cpp
@@ -5,6 +5,8 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
+
 #include <lvgl.h>
 #include <algorithm>
 #include <cstring>
@@ -87,7 +89,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, nullptr);
 
@@ -106,7 +108,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
     return 0;
 }
diff --git a/Tactility/Source/app/appsettings/AppSettings.cpp b/Tactility/Source/app/appsettings/AppSettings.cpp
index bf6ce27fc..7bfc21553 100644
--- a/Tactility/Source/app/appsettings/AppSettings.cpp
+++ b/Tactility/Source/app/appsettings/AppSettings.cpp
@@ -10,6 +10,8 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
+
 #include <lvgl/widgets/toolbar.h>
 #include <lvgl.h>
 #include <algorithm>
@@ -96,7 +98,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, nullptr);
 
@@ -118,7 +120,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/apwebserver/ApWebServer.cpp b/Tactility/Source/app/apwebserver/ApWebServer.cpp
index 3758668c7..8ede703dd 100644
--- a/Tactility/Source/app/apwebserver/ApWebServer.cpp
+++ b/Tactility/Source/app/apwebserver/ApWebServer.cpp
@@ -13,6 +13,7 @@
 
 #include <lvgl.h>
 #include <lvgl/widgets/toolbar.h>
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 namespace tt::app::apwebserver {
@@ -132,7 +133,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -173,7 +174,7 @@ int32_t appMain(int argc, char* argv[]) {
     });
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/audiosettings/AudioSettings.cpp b/Tactility/Source/app/audiosettings/AudioSettings.cpp
index 4b632060f..0d37cd25e 100644
--- a/Tactility/Source/app/audiosettings/AudioSettings.cpp
+++ b/Tactility/Source/app/audiosettings/AudioSettings.cpp
@@ -9,6 +9,8 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
+
 #include <lvgl/lvgl.h>
 #include <lvgl/widgets/sliderbox.h>
 #include <lvgl/widgets/toolbar.h>
@@ -221,7 +223,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -248,7 +250,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/boot/Boot.cpp b/Tactility/Source/app/boot/Boot.cpp
index 855adc751..33381c3a7 100644
--- a/Tactility/Source/app/boot/Boot.cpp
+++ b/Tactility/Source/app/boot/Boot.cpp
@@ -1,5 +1,6 @@
 #include "tactility/system_event.h"
 
+#include <tactility/check.h>
 #include <tactility/delay.h>
 #include <tactility/drivers/backlight.h>
 #include <tactility/drivers/display.h>
@@ -298,7 +299,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     bootWindowId = window_manager_create(appInstanceId, createSplashWidgets, nullptr);
 
@@ -324,7 +325,7 @@ int32_t appMain(int argc, char* argv[]) {
     if (bootWindowId != 0) {
         window_manager_remove(bootWindowId);
     }
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/btmanage/BtManage.cpp b/Tactility/Source/app/btmanage/BtManage.cpp
index 8e35f0744..8aae722db 100644
--- a/Tactility/Source/app/btmanage/BtManage.cpp
+++ b/Tactility/Source/app/btmanage/BtManage.cpp
@@ -12,6 +12,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 namespace tt::app::btmanage {
@@ -226,7 +227,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -276,7 +277,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/btpeersettings/BtPeerSettings.cpp b/Tactility/Source/app/btpeersettings/BtPeerSettings.cpp
index 95eb36926..75b8a3bb8 100644
--- a/Tactility/Source/app/btpeersettings/BtPeerSettings.cpp
+++ b/Tactility/Source/app/btpeersettings/BtPeerSettings.cpp
@@ -15,6 +15,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/device.h>
 #include <tactility/drivers/bluetooth.h>
 #include <tactility/log.h>
@@ -205,7 +206,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -246,7 +247,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/chat/ChatApp.cpp b/Tactility/Source/app/chat/ChatApp.cpp
index 5c3b26f8d..d0b054381 100644
--- a/Tactility/Source/app/chat/ChatApp.cpp
+++ b/Tactility/Source/app/chat/ChatApp.cpp
@@ -14,6 +14,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <lvgl/lvgl.h>
@@ -191,7 +192,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -213,7 +214,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     service::espnow::unsubscribeReceiver(ctx.receiveSubscription);
diff --git a/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp b/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp
index e88ecc2a9..bd73cfc57 100644
--- a/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp
+++ b/Tactility/Source/app/crashdiagnostics/CrashDiagnostics.cpp
@@ -14,6 +14,7 @@
 
 #include <lvgl.h>
 #include <qrcode.h>
+#include <tactility/check.h>
 #include <tactility/drivers/pointer.h>
 #include <tactility/log.h>
 
@@ -159,7 +160,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -183,7 +184,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     bool continuePressed = ctx.continuePressed;
diff --git a/Tactility/Source/app/development/Development.cpp b/Tactility/Source/app/development/Development.cpp
index 77f3fac06..6f69dc677 100644
--- a/Tactility/Source/app/development/Development.cpp
+++ b/Tactility/Source/app/development/Development.cpp
@@ -14,6 +14,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <lvgl.h>
@@ -180,7 +181,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -222,7 +223,7 @@ int32_t appMain(int argc, char* argv[]) {
     lvgl_unlock();
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/display/Display.cpp b/Tactility/Source/app/display/Display.cpp
index 0a3a423e4..51fb52bbb 100644
--- a/Tactility/Source/app/display/Display.cpp
+++ b/Tactility/Source/app/display/Display.cpp
@@ -1,4 +1,5 @@
 #include <lvgl/lvgl.h>
+#include <tactility/check.h>
 #include <tactility/device.h>
 #include <tactility/drivers/backlight.h>
 #include <tactility/drivers/display.h>
@@ -313,7 +314,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -336,7 +337,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/files/FilesApp.cpp b/Tactility/Source/app/files/FilesApp.cpp
index 048d763ad..c08d48423 100644
--- a/Tactility/Source/app/files/FilesApp.cpp
+++ b/Tactility/Source/app/files/FilesApp.cpp
@@ -8,6 +8,8 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
+
 #include <memory>
 
 namespace tt::app::files {
@@ -36,7 +38,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &createContext);
 
@@ -63,7 +65,7 @@ int32_t appMain(int argc, char* argv[]) {
 
     view.deinit();
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/fileselection/FileSelection.cpp b/Tactility/Source/app/fileselection/FileSelection.cpp
index a89651db0..96f4f31bf 100644
--- a/Tactility/Source/app/fileselection/FileSelection.cpp
+++ b/Tactility/Source/app/fileselection/FileSelection.cpp
@@ -9,6 +9,8 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
+
 #include <memory>
 #include <string>
 
@@ -68,7 +70,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -87,7 +89,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return ctx.result;
diff --git a/Tactility/Source/app/gpssettings/GpsSettings.cpp b/Tactility/Source/app/gpssettings/GpsSettings.cpp
index a8ee385b6..8bb66e2b1 100644
--- a/Tactility/Source/app/gpssettings/GpsSettings.cpp
+++ b/Tactility/Source/app/gpssettings/GpsSettings.cpp
@@ -13,6 +13,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/device.h>
 #include <tactility/time.h>
 
@@ -273,7 +274,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
     ctx.timer->start();
@@ -317,7 +318,7 @@ int32_t appMain(int argc, char* argv[]) {
 
     ctx.timer->stop();
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/grovesettings/GroveSettings.cpp b/Tactility/Source/app/grovesettings/GroveSettings.cpp
index 5edd01470..846143571 100644
--- a/Tactility/Source/app/grovesettings/GroveSettings.cpp
+++ b/Tactility/Source/app/grovesettings/GroveSettings.cpp
@@ -2,6 +2,7 @@
 
 #include <lvgl.h>
 
+#include <tactility/check.h>
 #include <tactility/device.h>
 #include <tactility/drivers/grove.h>
 
@@ -99,7 +100,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -121,7 +122,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/i2cscanner/I2cScanner.cpp b/Tactility/Source/app/i2cscanner/I2cScanner.cpp
index e3b56ae1c..7f7f76b17 100644
--- a/Tactility/Source/app/i2cscanner/I2cScanner.cpp
+++ b/Tactility/Source/app/i2cscanner/I2cScanner.cpp
@@ -13,6 +13,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/drivers/i2c_controller.h>
 #include <tactility/log.h>
 #include <tactility/preferences.h>
@@ -394,7 +395,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -417,7 +418,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/imageviewer/ImageViewer.cpp b/Tactility/Source/app/imageviewer/ImageViewer.cpp
index c7fcc0b08..bf47bda6d 100644
--- a/Tactility/Source/app/imageviewer/ImageViewer.cpp
+++ b/Tactility/Source/app/imageviewer/ImageViewer.cpp
@@ -95,7 +95,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -117,7 +117,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/inputdialog/InputDialog.cpp b/Tactility/Source/app/inputdialog/InputDialog.cpp
index 0fb743be4..459dc0996 100644
--- a/Tactility/Source/app/inputdialog/InputDialog.cpp
+++ b/Tactility/Source/app/inputdialog/InputDialog.cpp
@@ -8,6 +8,7 @@
 #include <lvgl_window_manager/window_manager.h>
 
 #include <lvgl/widgets/toolbar.h>
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <lvgl.h>
@@ -117,7 +118,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -136,7 +137,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return ctx.result;
diff --git a/Tactility/Source/app/keyboard/KeyboardSettings.cpp b/Tactility/Source/app/keyboard/KeyboardSettings.cpp
index c43208a2e..8738bbbf6 100644
--- a/Tactility/Source/app/keyboard/KeyboardSettings.cpp
+++ b/Tactility/Source/app/keyboard/KeyboardSettings.cpp
@@ -11,6 +11,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/device.h>
 #include <tactility/drivers/backlight.h>
 
@@ -215,7 +216,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -238,7 +239,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/launcher/Launcher.cpp b/Tactility/Source/app/launcher/Launcher.cpp
index 6bbd92321..995538033 100644
--- a/Tactility/Source/app/launcher/Launcher.cpp
+++ b/Tactility/Source/app/launcher/Launcher.cpp
@@ -15,6 +15,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/device.h>
 #include <tactility/drivers/power_supply.h>
 #include <tactility/log.h>
@@ -240,7 +241,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, nullptr);
 
@@ -261,7 +262,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
     return 0;
 }
diff --git a/Tactility/Source/app/localesettings/LocaleSettings.cpp b/Tactility/Source/app/localesettings/LocaleSettings.cpp
index fef376dbe..186eee5a0 100644
--- a/Tactility/Source/app/localesettings/LocaleSettings.cpp
+++ b/Tactility/Source/app/localesettings/LocaleSettings.cpp
@@ -13,6 +13,8 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
+
 #include <lvgl/widgets/toolbar.h>
 
 #include <lvgl.h>
@@ -151,7 +153,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -173,7 +175,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/notes/Notes.cpp b/Tactility/Source/app/notes/Notes.cpp
index 9975ecd73..94d6b5d2c 100644
--- a/Tactility/Source/app/notes/Notes.cpp
+++ b/Tactility/Source/app/notes/Notes.cpp
@@ -12,6 +12,7 @@
 #include <lvgl.h>
 #include <lvgl/lvgl.h>
 #include <lvgl/widgets/toolbar.h>
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 namespace tt::app::notes {
@@ -196,7 +197,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -240,7 +241,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/power/Power.cpp b/Tactility/Source/app/power/Power.cpp
index df377b639..6b1e28af5 100644
--- a/Tactility/Source/app/power/Power.cpp
+++ b/Tactility/Source/app/power/Power.cpp
@@ -8,6 +8,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/device.h>
 #include <tactility/drivers/power_supply.h>
 #include <tactility/time.h>
@@ -246,7 +247,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
     ctx.timer->start();
@@ -270,7 +271,7 @@ int32_t appMain(int argc, char* argv[]) {
 
     ctx.timer->stop();
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/poweroff/PowerOff.cpp b/Tactility/Source/app/poweroff/PowerOff.cpp
index f837dee40..81ec9451c 100644
--- a/Tactility/Source/app/poweroff/PowerOff.cpp
+++ b/Tactility/Source/app/poweroff/PowerOff.cpp
@@ -10,6 +10,7 @@
 
 #include <lvgl.h>
 #include <lvgl/fonts.h>
+#include <tactility/check.h>
 #include <tactility/device.h>
 #include <tactility/drivers/power_supply.h>
 
@@ -142,7 +143,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -164,7 +165,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/screenshot/Screenshot.cpp b/Tactility/Source/app/screenshot/Screenshot.cpp
index 72c423e78..93fe098f0 100644
--- a/Tactility/Source/app/screenshot/Screenshot.cpp
+++ b/Tactility/Source/app/screenshot/Screenshot.cpp
@@ -16,6 +16,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <lvgl.h>
@@ -256,7 +257,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -282,7 +283,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/selectiondialog/SelectionDialog.cpp b/Tactility/Source/app/selectiondialog/SelectionDialog.cpp
index a31b2c864..c0b5d7b50 100644
--- a/Tactility/Source/app/selectiondialog/SelectionDialog.cpp
+++ b/Tactility/Source/app/selectiondialog/SelectionDialog.cpp
@@ -7,6 +7,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <lvgl.h>
@@ -110,7 +111,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -129,7 +130,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return ctx.result;
diff --git a/Tactility/Source/app/settings/Settings.cpp b/Tactility/Source/app/settings/Settings.cpp
index 823cc97ea..22ea8513c 100644
--- a/Tactility/Source/app/settings/Settings.cpp
+++ b/Tactility/Source/app/settings/Settings.cpp
@@ -85,7 +85,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, nullptr);
 
@@ -104,7 +104,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
     return 0;
 }
diff --git a/Tactility/Source/app/setup/Setup.cpp b/Tactility/Source/app/setup/Setup.cpp
index 356e5823d..6382df639 100644
--- a/Tactility/Source/app/setup/Setup.cpp
+++ b/Tactility/Source/app/setup/Setup.cpp
@@ -15,6 +15,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <lvgl/fonts.h>
@@ -235,7 +236,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -264,7 +265,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/systeminfo/SystemInfo.cpp b/Tactility/Source/app/systeminfo/SystemInfo.cpp
index 6917020b5..912b261f6 100644
--- a/Tactility/Source/app/systeminfo/SystemInfo.cpp
+++ b/Tactility/Source/app/systeminfo/SystemInfo.cpp
@@ -1,3 +1,4 @@
+#include <tactility/check.h>
 #include "tactility/time.h"
 
 #include <Tactility/DeprecatedPaths.h>
@@ -423,7 +424,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
     ctx.memoryTimer->start();   // Memory: every 10s
@@ -449,7 +450,7 @@ int32_t appMain(int argc, char* argv[]) {
     ctx.memoryTimer->stop();
     ctx.tasksTimer->stop();
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp b/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp
index 1ef225c0a..e706460b5 100644
--- a/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp
+++ b/Tactility/Source/app/timedatesettings/TimeDateSettings.cpp
@@ -10,6 +10,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <lvgl/lvgl.h>
@@ -163,7 +164,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -200,7 +201,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/timezone/TimeZone.cpp b/Tactility/Source/app/timezone/TimeZone.cpp
index f2b3bd259..77318c578 100644
--- a/Tactility/Source/app/timezone/TimeZone.cpp
+++ b/Tactility/Source/app/timezone/TimeZone.cpp
@@ -13,6 +13,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <lvgl/lvgl.h>
@@ -246,7 +247,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
     ctx.updateTimer->start();
@@ -267,7 +268,7 @@ int32_t appMain(int argc, char* argv[]) {
 
     ctx.updateTimer->stop();
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return ctx.result;
diff --git a/Tactility/Source/app/touchcalibration/TouchCalibration.cpp b/Tactility/Source/app/touchcalibration/TouchCalibration.cpp
index 85db06d20..dd0f0047d 100644
--- a/Tactility/Source/app/touchcalibration/TouchCalibration.cpp
+++ b/Tactility/Source/app/touchcalibration/TouchCalibration.cpp
@@ -12,6 +12,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 #include <lvgl/lvgl.h>
 #include <lvgl/devices/pointer.h>
@@ -239,7 +240,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -261,7 +262,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     // finishCalibration() already applied a new calibration on success. On cancel/failure,
diff --git a/Tactility/Source/app/trackball/TrackballSettings.cpp b/Tactility/Source/app/trackball/TrackballSettings.cpp
index 1e7148434..90ef53bb9 100644
--- a/Tactility/Source/app/trackball/TrackballSettings.cpp
+++ b/Tactility/Source/app/trackball/TrackballSettings.cpp
@@ -5,6 +5,7 @@
 #include <lvgl/lvgl.h>
 #include <lvgl/widgets/toolbar.h>
 
+#include <tactility/check.h>
 #include <tactility/drivers/trackball.h>
 
 #include <Tactility/Assets.h>
@@ -278,7 +279,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -301,7 +302,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/usbsettings/UsbSettings.cpp b/Tactility/Source/app/usbsettings/UsbSettings.cpp
index a36f1e325..c517a314a 100644
--- a/Tactility/Source/app/usbsettings/UsbSettings.cpp
+++ b/Tactility/Source/app/usbsettings/UsbSettings.cpp
@@ -7,6 +7,8 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
+
 #include <lvgl.h>
 #include <lvgl/widgets/toolbar.h>
 
@@ -91,7 +93,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -113,7 +115,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/webserversettings/WebServerSettings.cpp b/Tactility/Source/app/webserversettings/WebServerSettings.cpp
index 29b4caa26..c5efd2583 100644
--- a/Tactility/Source/app/webserversettings/WebServerSettings.cpp
+++ b/Tactility/Source/app/webserversettings/WebServerSettings.cpp
@@ -12,6 +12,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/log.h>
 
 #include <lvgl.h>
@@ -368,7 +369,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     WindowId window = window_manager_create(appInstanceId, createWidgets, &ctx);
 
@@ -428,7 +429,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp b/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp
index 4e12f0633..13cc95ad0 100644
--- a/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp
+++ b/Tactility/Source/app/wifiapsettings/WifiApSettings.cpp
@@ -13,6 +13,7 @@
 #include <lvgl/lvgl.h>
 #include <lvgl/widgets/toolbar.h>
 
+#include <tactility/check.h>
 #include <tactility/device.h>
 #include <tactility/log.h>
 
@@ -227,7 +228,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     Device* wifi_device = nullptr;
     if (device_get_first_by_type(&WIFI_TYPE, &wifi_device) == ERROR_NONE) {
@@ -309,7 +310,7 @@ int32_t appMain(int argc, char* argv[]) {
         device_put(ctx.wifiDevice);
     }
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/wificonnect/WifiConnect.cpp b/Tactility/Source/app/wificonnect/WifiConnect.cpp
index bd1266059..70b7160c8 100644
--- a/Tactility/Source/app/wificonnect/WifiConnect.cpp
+++ b/Tactility/Source/app/wificonnect/WifiConnect.cpp
@@ -15,6 +15,7 @@
 #include <lvgl/widgets/spinner.h>
 #include <lvgl/widgets/toolbar.h>
 
+#include <tactility/check.h>
 #include <tactility/device.h>
 #include <tactility/log.h>
 
@@ -313,7 +314,7 @@ int32_t appMain(int argc, char* argv[]) {
     task_event_group_construct(&event_group);
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     Device* wifi_device = nullptr;
     if (device_get_first_by_type(&WIFI_TYPE, &wifi_device) == ERROR_NONE) {
@@ -370,7 +371,7 @@ int32_t appMain(int argc, char* argv[]) {
         device_put(ctx.wifiDevice);
     }
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;
diff --git a/Tactility/Source/app/wifimanage/WifiManage.cpp b/Tactility/Source/app/wifimanage/WifiManage.cpp
index bb9f79fa5..935f8b400 100644
--- a/Tactility/Source/app/wifimanage/WifiManage.cpp
+++ b/Tactility/Source/app/wifimanage/WifiManage.cpp
@@ -11,6 +11,7 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <tactility/check.h>
 #include <tactility/device.h>
 #include <tactility/log.h>
 
@@ -147,7 +148,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     AppEventSubscription sub {};
-    app_event_subscribe(&sub, &event_group);
+    check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
 
     Device* wifi_device = nullptr;
     if (device_get_first_by_type(&WIFI_TYPE, &wifi_device) == ERROR_NONE) {
@@ -229,7 +230,7 @@ int32_t appMain(int argc, char* argv[]) {
     }
 
     window_manager_remove(window);
-    app_event_unsubscribe(&sub);
+    check(app_event_unsubscribe(&sub) == ERROR_NONE);
     task_event_group_destruct(&event_group);
 
     return 0;