diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index af6fc909f7..b88728dc57 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -15,7 +15,6 @@ import com.mogo.module.carchatting.card.CallChatConstant;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.media.MediaConstants;
-import com.mogo.module.push.PushUIConstants;
 import com.mogo.module.service.ServiceConst;
 import com.mogo.module.tanlu.constant.TanluConstants;
 import com.mogo.module.v2x.V2XConst;
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 8ea1a8c85b..7f7a2cc9a0 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -17,6 +17,7 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationClient;
@@ -261,6 +262,13 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             }
         });
 
+        if ( DebugConfig.isDebug() ) {
+            mMove2CurrentLocation.setOnLongClickListener( view -> {
+                mApis.getSearchManagerApi().goSettings();
+                return true;
+            } );
+        }
+
 //        mNaviInfo = findViewById( R.id.module_entrance_id_navi_info_panel );
         ConstraintLayout rootView = findViewById(R.id.module_entrance_id_top_motion_layout);
         if (rootView != null) {
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
index 22daa9f9bc..876d4c01d2 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
@@ -137,8 +137,8 @@ public class MogoModulesManager implements MogoModulesHandler {
             if ( baseModule == null ) {
                 continue;
             }
-            load( baseModule.getPath() );
             Logger.d( TAG, "加载基本模块：%s", baseModule.getPath() );
+            load( baseModule.getPath() );
         }
     }
 
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java b/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java
index cd397a17bb..0aea3f824d 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java
@@ -69,6 +69,10 @@ public class FragmentStack {
             return;
         }
 
+        if ( mFragmentManager == null ) {
+            return;
+        }
+
         FragmentTransaction  mFragmentTransaction = mFragmentManager.beginTransaction();
 
         if ( mCurrentFragment != null ) {
@@ -100,6 +104,9 @@ public class FragmentStack {
             invokeCallback();
             return;
         }
+        if ( mFragmentManager == null ) {
+            return;
+        }
 
         FragmentTransaction  mFragmentTransaction = mFragmentManager.beginTransaction();
 
@@ -163,6 +170,10 @@ public class FragmentStack {
 
     public void clearAll() {
 
+        if ( mFragmentManager == null ) {
+            return;
+        }
+
         if ( mFragmentStack.isEmpty() ) {
             invokeCallback();
             return;