diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index d8b12b34..21dc4822 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -32,5 +32,5 @@ add_library(${CMAKE_PROJECT_NAME} SHARED app.cpp)
 # can link libraries from various origins, such as libraries defined in this
 # build script, prebuilt third-party libraries, or Android system libraries.
 target_link_libraries(${CMAKE_PROJECT_NAME}	droidboot_gui)
-target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC -fsanitize=address -fsanitize-recover=address -fno-omit-frame-pointer)
-target_link_options(${CMAKE_PROJECT_NAME} PUBLIC -fsanitize=address -fsanitize-recover=address)
+target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC -fsanitize=address -fsanitize=undefined -fno-omit-frame-pointer)
+target_link_options(${CMAKE_PROJECT_NAME} PUBLIC -fsanitize=address -fsanitize=undefined)
diff --git a/app/src/main/cpp/droidboot_gui b/app/src/main/cpp/droidboot_gui
index 19bd2893..b62f38d5 160000
--- a/app/src/main/cpp/droidboot_gui
+++ b/app/src/main/cpp/droidboot_gui
@@ -1 +1 @@
-Subproject commit 19bd2893f99b359c9b565fae1751c81938beb5db
+Subproject commit b62f38d51d14e4a507df24f2f6aabb0d63f8ca4f
diff --git a/app/src/main/resources/lib/arm64-v8a/wrap.sh b/app/src/main/resources/lib/arm64-v8a/wrap.sh
index b91cfdc5..053f56be 100644
--- a/app/src/main/resources/lib/arm64-v8a/wrap.sh
+++ b/app/src/main/resources/lib/arm64-v8a/wrap.sh
@@ -14,8 +14,7 @@ elif [ "$os_version" -eq "28" ]; then
 else
   cmd="$cmd -XjdwpProvider:adbconnection -XjdwpOptions:suspend=n,server=y $@"
 fi
-#export ASAN_OPTIONS=log_to_syslog=true,allow_user_segv_handler=1,detect_stack_use_after_return=true,check_initialization_order=true,halt_on_error=false
-export ASAN_OPTIONS=log_to_syslog=true
+export ASAN_OPTIONS=log_to_syslog=true,allow_user_segv_handler=1,detect_stack_use_after_return=true,check_initialization_order=true
 ASAN_LIB=$(ls "$HERE"/libclang_rt.asan-*-android.so)
 if [ -f "$HERE/libc++_shared.so" ]; then
     # Workaround for https://github.com/android-ndk/ndk/issues/988.