diff --git a/Source/Basic/Application.cpp b/Source/Basic/Application.cpp
index 9d9626725..70d6f0cf5 100644
--- a/Source/Basic/Application.cpp
+++ b/Source/Basic/Application.cpp
@@ -647,7 +647,7 @@ int Application::mainLogic(bx::Thread* thread, void* userData) {
 	Application* app = r_cast<Application*>(userData);
 	try {
 		return mainLogic(app);
-	} catch (const std::runtime_error& e) {
+	} catch (const std::exception& e) {
 		LogError(e.what());
 		std::abort();
 	}
diff --git a/Tools/dora-wa/upload.py b/Tools/dora-wa/upload.py
index 0e696cd56..a1ac0eb6b 100644
--- a/Tools/dora-wa/upload.py
+++ b/Tools/dora-wa/upload.py
@@ -29,7 +29,7 @@
     # Compile the WA project
     print("Compiling WA project...")
     try:
-        subprocess.run(["wa", "build", "-optimize"], check=True)
+        subprocess.run(["wa", "build", "--target", "wasi", "-optimize"], check=True)
         print("Compilation complete.")
     except subprocess.CalledProcessError as e:
         print(f"Error during compilation.")