diff --git a/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt b/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt
index e17e64cce9..70f69d7e96 100644
--- a/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt
+++ b/app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt
@@ -7,17 +7,17 @@ import com.gh.gamecenter.core.provider.IUserManagerProvider
 import com.gh.gamecenter.manager.UserManager
 
 @Route(path = RouteConsts.provider.userManager, name = "UserManager暴露服务")
-class UserManagerProviderImpl: IUserManagerProvider {
+class UserManagerProviderImpl : IUserManagerProvider {
     override fun userShouldTakeRegulationBaseOnLastRemind(): Boolean {
         return UserManager.getInstance().userShouldTakeRegulationBaseOnLastRemind()
     }
 
     override fun getUserId(): String {
-        return UserManager.getInstance().userId
+        return UserManager.getInstance().userId ?: ""
     }
 
     override fun getToken(): String {
-        return UserManager.getInstance().token
+        return UserManager.getInstance().token ?: ""
     }
 
     override fun refreshToken(accessToken: String, success: () -> Unit, fail: (String?) -> Unit) {
diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java
index dd3b901850..283e2e0741 100644
--- a/app/src/main/java/com/halo/assistant/HaloApp.java
+++ b/app/src/main/java/com/halo/assistant/HaloApp.java
@@ -24,12 +24,11 @@ import com.facebook.imagepipeline.core.ImagePipelineConfig;
 import com.facebook.imagepipeline.core.ImageTranscoderType;
 import com.facebook.imagepipeline.core.MemoryChunkType;
 import com.facebook.imagepipeline.decoder.ImageDecoderConfig;
+import com.gh.base.AppUncaughtHandler;
 import com.gh.base.GlobalActivityLifecycleObserver;
 import com.gh.common.FixedRateJobHelper;
 import com.gh.common.exposure.ExposureManager;
 import com.gh.common.filter.RegionSettingHelper;
-import com.gh.gamecenter.common.loghub.LoghubUtils;
-import com.gh.gamecenter.common.tracker.Tracker;
 import com.gh.common.util.DataUtils;
 import com.gh.common.util.DownloadNotificationHelper;
 import com.gh.common.util.DownloadObserver;
@@ -42,6 +41,8 @@ import com.gh.gamecenter.Injection;
 import com.gh.gamecenter.common.constant.Config;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.common.image.EmptyDecoder;
+import com.gh.gamecenter.common.loghub.LoghubUtils;
+import com.gh.gamecenter.common.tracker.Tracker;
 import com.gh.gamecenter.common.utils.DeviceUtils;
 import com.gh.gamecenter.common.utils.EmulatorUtil;
 import com.gh.gamecenter.common.utils.ExtensionsKt;
@@ -178,6 +179,7 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid
         if (!Injection.appInit(this)) {
             return;
         }
+        initAppUncaughtHandler();
 
         mInstance = this;
 
@@ -241,6 +243,13 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid
         NightModeUtils.INSTANCE.initNightMode();
     }
 
+    private void initAppUncaughtHandler(){
+        if (!BuildConfig.DEBUG) {
+            AppUncaughtHandler appUncaughtHandler = new AppUncaughtHandler(this);
+            Thread.setDefaultUncaughtExceptionHandler(appUncaughtHandler);
+        }
+    }
+
     /**
      * 需要延迟初始化的东西，以下代码调用都放置到用户同意了隐私政策之后
      */
diff --git a/module_common/src/release/java/com/gh/gamecenter/Injection.java b/module_common/src/release/java/com/gh/gamecenter/Injection.java
index c25c7dbe4d..104ed9a42a 100644
--- a/module_common/src/release/java/com/gh/gamecenter/Injection.java
+++ b/module_common/src/release/java/com/gh/gamecenter/Injection.java
@@ -2,7 +2,7 @@ package com.gh.gamecenter;
 
 import android.app.Application;
 
-import com.gh.base.AppUncaughtHandler;
+//import com.gh.base.AppUncaughtHandler;
 
 import okhttp3.OkHttpClient;
 
@@ -15,8 +15,8 @@ import okhttp3.OkHttpClient;
 public class Injection {
 
     public static boolean appInit(Application application) {
-        AppUncaughtHandler appUncaughtHandler = new AppUncaughtHandler(application);
-        Thread.setDefaultUncaughtExceptionHandler(appUncaughtHandler);
+//        AppUncaughtHandler appUncaughtHandler = new AppUncaughtHandler(application);
+//        Thread.setDefaultUncaughtExceptionHandler(appUncaughtHandler);
         return true;
     }