diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index b9077b0cb..0f5502f54 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -1013,7 +1013,7 @@ class LastWindowPosition {
       return LastWindowPosition(m["width"], m["height"], m["offsetWidth"],
           m["offsetHeight"], m["isMaximized"]);
     } catch (e) {
-      debugPrint(e.toString());
+      debugPrintStack(label: e.toString());
       return null;
     }
   }
@@ -1147,7 +1147,7 @@ Future<bool> restoreWindowPosition(WindowType type, {int? windowId}) async {
   final pos = bind.getLocalFlutterConfig(k: kWindowPrefix + type.name);
   var lpos = LastWindowPosition.loadFromString(pos);
   if (lpos == null) {
-    debugPrint("window position saved, but cannot be parsed");
+    debugPrint("no window position saved, ignoring position restoration");
     return false;
   }
 
@@ -1212,7 +1212,7 @@ Future<void> initUniLinks() async {
     }
     parseRustdeskUri(initialLink);
   } catch (err) {
-    debugPrint("$err");
+    debugPrintStack(label: "$err");
   }
 }
 
@@ -1422,7 +1422,7 @@ void onActiveWindowChanged() async {
         rustDeskWinManager.closeAllSubWindows()
       ]);
     } catch (err) {
-      debugPrint("$err");
+      debugPrintStack(label: "$err");
     } finally {
       await windowManager.setPreventClose(false);
       await windowManager.close();
diff --git a/flutter/lib/common/widgets/peer_tab_page.dart b/flutter/lib/common/widgets/peer_tab_page.dart
index 5a498a1c4..1711e7b72 100644
--- a/flutter/lib/common/widgets/peer_tab_page.dart
+++ b/flutter/lib/common/widgets/peer_tab_page.dart
@@ -79,16 +79,19 @@ class _PeerTabPageState extends State<PeerTabPage>
         .toList()
         .obs;
     try {
-      final json = jsonDecode(bind.getLocalFlutterConfig(k: 'peer-tab-order'));
-      if (json is List) {
-        final List<String> list = json.map((e) => e.toString()).toList();
-        if (list.length == visibleOrderedTabs.length &&
-            visibleOrderedTabs.every((e) => list.contains(e))) {
-          visibleOrderedTabs.value = list;
+      final conf = bind.getLocalFlutterConfig(k: 'peer-tab-order');
+      if (conf.isNotEmpty) {
+        final json = jsonDecode(conf);
+        if (json is List) {
+          final List<String> list = json.map((e) => e.toString()).toList();
+          if (list.length == visibleOrderedTabs.length &&
+              visibleOrderedTabs.every((e) => list.contains(e))) {
+            visibleOrderedTabs.value = list;
+          }
         }
       }
     } catch (e) {
-      debugPrint('$e');
+      debugPrintStack(label: '$e');
     }
 
     adjustTab();
diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart
index a51b4d035..06cabebe7 100644
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -63,7 +63,7 @@ class DesktopSettingPage extends StatefulWidget {
         DesktopTabPage.onAddSetting(initialPage: page);
       }
     } catch (e) {
-      debugPrint('$e');
+      debugPrintStack(label: '$e');
     }
   }
 }
diff --git a/flutter/lib/desktop/pages/desktop_tab_page.dart b/flutter/lib/desktop/pages/desktop_tab_page.dart
index 794dd1c08..57c7fe4b8 100644
--- a/flutter/lib/desktop/pages/desktop_tab_page.dart
+++ b/flutter/lib/desktop/pages/desktop_tab_page.dart
@@ -31,7 +31,7 @@ class DesktopTabPage extends StatefulWidget {
             initialPage: initialPage,
           )));
     } catch (e) {
-      debugPrint('$e');
+      debugPrintStack(label: '$e');
     }
   }
 }
diff --git a/flutter/lib/desktop/widgets/login.dart b/flutter/lib/desktop/widgets/login.dart
index 3e58a6de2..053653ab3 100644
--- a/flutter/lib/desktop/widgets/login.dart
+++ b/flutter/lib/desktop/widgets/login.dart
@@ -460,7 +460,7 @@ Future<bool> loginDialog() async {
         debugPrint('$resp');
         completer.complete(true);
       } catch (err) {
-        debugPrint(err.toString());
+        debugPrintStack(label: err.toString());
         cancel();
         return;
       }
diff --git a/flutter/lib/mobile/pages/server_page.dart b/flutter/lib/mobile/pages/server_page.dart
index 0b2a51d40..38ad18f14 100644
--- a/flutter/lib/mobile/pages/server_page.dart
+++ b/flutter/lib/mobile/pages/server_page.dart
@@ -564,7 +564,7 @@ void androidChannelInit() {
           }
       }
     } catch (e) {
-      debugPrint("MethodCallHandler err:$e");
+      debugPrintStack(label: "MethodCallHandler err:$e");
     }
     return "";
   });
diff --git a/flutter/lib/models/native_model.dart b/flutter/lib/models/native_model.dart
index 0a833583e..cf2de4219 100644
--- a/flutter/lib/models/native_model.dart
+++ b/flutter/lib/models/native_model.dart
@@ -126,7 +126,7 @@ class PlatformFFI {
           // no need to set home dir
         }
       } catch (e) {
-        debugPrint('initialize failed: $e');
+        debugPrintStack(label: 'initialize failed: $e');
       }
       String id = 'NA';
       String name = 'Flutter';
@@ -151,9 +151,8 @@ class PlatformFFI {
           WindowsDeviceInfo winInfo = await deviceInfo.windowsInfo;
           name = winInfo.computerName;
           id = winInfo.computerName;
-        } catch (e, stacktrace) {
-          debugPrint("get windows device info failed: $e");
-          debugPrintStack(stackTrace: stacktrace);
+        } catch (e) {
+          debugPrintStack(label: "get windows device info failed: $e");
           name = "unknown";
           id = "unknown";
         }
@@ -174,7 +173,7 @@ class PlatformFFI {
       await _ffiBind.mainSetHomeDir(home: _homeDir);
       await _ffiBind.mainInit(appDir: _dir);
     } catch (e) {
-      debugPrint('initialize failed: $e');
+      debugPrintStack(label: 'initialize failed: $e');
     }
     version = await getVersion();
   }