diff --git a/README.md b/README.md
index 2ca3049..b848380 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Reset Your IDE Eval Information
 
-1. Download and install plugin from [Download Link](https://plugins.zhile.io/files/ide-eval-resetter-2.1.14-d2fedb86.zip).
+1. Download and install plugin from [Download Link](https://plugins.zhile.io/files/ide-eval-resetter-2.1.15-3ef56c82.zip).
     * Alternative installation method: 
         * Add "Custom Plugin Repository": `https://plugins.zhile.io` manually (`Settings/Preferences` -> `Plugins`)
         * Search and install plugin: `IDE Eval Reset`
diff --git a/build.gradle b/build.gradle
index 207eeb6..9ec7d03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,10 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '0.6.5'
+    id 'org.jetbrains.intellij' version '0.7.3'
 }
 
 group 'io.zhile.research.intellij'
-version '2.1.14'
+version '2.1.15'
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
@@ -23,12 +23,14 @@ buildPlugin {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version "2020.2.4"
-    type "IU"
+    version = "2020.2.4"
+    type = "IU"
 }
 
 patchPluginXml {
-    changeNotes """<pre>
+    changeNotes = """<pre>
+Release v2.1.15
+  1. fix welcome screen menu for 2021.1
 Release v2.1.14
   1. fix minor exceptions
 Release v2.1.13
@@ -81,6 +83,6 @@ Release v1.0.2
   1. compatibility fix
 </pre>"""
 
-    sinceBuild "145.258"
-    untilBuild null
+    sinceBuild = "145.258"
+    untilBuild = null
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 7cffce8..8985bef 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1 @@
 rootProject.name = 'ide-eval-resetter'
-
diff --git a/src/main/java/io/zhile/research/intellij/ier/listener/AppActivationListener.java b/src/main/java/io/zhile/research/intellij/ier/listener/AppActivationListener.java
index b6d69db..0e7fd79 100644
--- a/src/main/java/io/zhile/research/intellij/ier/listener/AppActivationListener.java
+++ b/src/main/java/io/zhile/research/intellij/ier/listener/AppActivationListener.java
@@ -6,6 +6,7 @@ import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.application.ApplicationActivationListener;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.wm.IdeFrame;
 import com.intellij.util.messages.MessageBusConnection;
 import io.zhile.research.intellij.ier.common.Resetter;
@@ -15,6 +16,7 @@ import io.zhile.research.intellij.ier.helper.ResetTimeHelper;
 import org.jetbrains.annotations.NotNull;
 
 public class AppActivationListener implements ApplicationActivationListener, Disposable {
+    private static final Logger LOG = Logger.getInstance(AppActivationListener.class);
     private static AppActivationListener instance;
     private static MessageBusConnection connection;
 
@@ -35,8 +37,12 @@ public class AppActivationListener implements ApplicationActivationListener, Dis
             return;
         }
 
-        connection = ApplicationManager.getApplication().getMessageBus().connect();
-        connection.subscribe(ApplicationActivationListener.TOPIC, this);
+        try {
+            connection = ApplicationManager.getApplication().getMessageBus().connect();
+            connection.subscribe(ApplicationActivationListener.TOPIC, this);
+        } catch (Exception e) {
+            LOG.warn("sub app activation failed.");
+        }
     }
 
     public synchronized void stop() {
diff --git a/src/main/java/io/zhile/research/intellij/ier/listener/AppEventListener.java b/src/main/java/io/zhile/research/intellij/ier/listener/AppEventListener.java
index f8c9bb6..8d16cca 100644
--- a/src/main/java/io/zhile/research/intellij/ier/listener/AppEventListener.java
+++ b/src/main/java/io/zhile/research/intellij/ier/listener/AppEventListener.java
@@ -3,6 +3,7 @@ package io.zhile.research.intellij.ier.listener;
 import com.intellij.ide.AppLifecycleListener;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Ref;
 import com.intellij.util.messages.MessageBusConnection;
@@ -13,6 +14,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class AppEventListener implements AppLifecycleListener, Disposable {
+    private static final Logger LOG = Logger.getInstance(AppEventListener.class);
     private static AppEventListener instance;
     private static MessageBusConnection connection;
 
@@ -33,8 +35,12 @@ public class AppEventListener implements AppLifecycleListener, Disposable {
             return;
         }
 
-        connection = ApplicationManager.getApplication().getMessageBus().connect();
-        connection.subscribe(AppLifecycleListener.TOPIC, this);
+        try {
+            connection = ApplicationManager.getApplication().getMessageBus().connect();
+            connection.subscribe(AppLifecycleListener.TOPIC, this);
+        } catch (Exception e) {
+            LOG.warn("sub app lifecycle failed.");
+        }
     }
 
     public synchronized void stop() {
diff --git a/src/main/java/io/zhile/research/intellij/ier/listener/AppInitListener.java b/src/main/java/io/zhile/research/intellij/ier/listener/AppInitListener.java
new file mode 100644
index 0000000..de01538
--- /dev/null
+++ b/src/main/java/io/zhile/research/intellij/ier/listener/AppInitListener.java
@@ -0,0 +1,50 @@
+package io.zhile.research.intellij.ier.listener;
+
+import com.intellij.ide.AppLifecycleListener;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Ref;
+import io.zhile.research.intellij.ier.helper.Constants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.ref.WeakReference;
+
+public class AppInitListener implements AppLifecycleListener, Disposable {
+    private static final WeakReference<AnAction> ACTION = new WeakReference<>(ActionManager.getInstance().getAction(Constants.RESET_ACTION_ID));
+
+    protected AppInitListener() {
+
+    }
+
+    public void appFrameCreated(String[] commandLineArgs, @NotNull Ref<Boolean> willOpenProject) {
+
+    }
+
+    public void appStarting(@Nullable Project projectFromCommandLine) {
+
+    }
+
+    public void projectFrameClosed() {
+
+    }
+
+    public void projectOpenFailed() {
+
+    }
+
+    public void welcomeScreenDisplayed() {
+
+    }
+
+    public void appClosing() {
+
+    }
+
+    @Override
+    public void dispose() {
+
+    }
+}
diff --git a/src/main/java/io/zhile/research/intellij/ier/listener/BrokenPluginsListener.java b/src/main/java/io/zhile/research/intellij/ier/listener/BrokenPluginsListener.java
index 9a18002..eeb1462 100644
--- a/src/main/java/io/zhile/research/intellij/ier/listener/BrokenPluginsListener.java
+++ b/src/main/java/io/zhile/research/intellij/ier/listener/BrokenPluginsListener.java
@@ -3,12 +3,14 @@ package io.zhile.research.intellij.ier.listener;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationActivationListener;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.wm.IdeFrame;
 import com.intellij.util.messages.MessageBusConnection;
 import io.zhile.research.intellij.ier.helper.BrokenPlugins;
 import org.jetbrains.annotations.NotNull;
 
 public class BrokenPluginsListener implements ApplicationActivationListener, Disposable {
+    private static final Logger LOG = Logger.getInstance(BrokenPluginsListener.class);
     private static BrokenPluginsListener instance;
     private static MessageBusConnection connection;
 
@@ -29,8 +31,12 @@ public class BrokenPluginsListener implements ApplicationActivationListener, Dis
             return;
         }
 
-        connection = ApplicationManager.getApplication().getMessageBus().connect();
-        connection.subscribe(ApplicationActivationListener.TOPIC, this);
+        try {
+            connection = ApplicationManager.getApplication().getMessageBus().connect();
+            connection.subscribe(ApplicationActivationListener.TOPIC, this);
+        } catch (Exception e) {
+            LOG.warn("sub app activation failed.");
+        }
     }
 
     public synchronized void stop() {
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 3b732c2..cb65d7b 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -26,5 +26,7 @@
     <applicationListeners>
         <listener class="io.zhile.research.intellij.ier.listener.PluginListener"
                   topic="com.intellij.ide.plugins.DynamicPluginListener"/>
+        <listener class="io.zhile.research.intellij.ier.listener.AppInitListener"
+                  topic="com.intellij.ide.AppLifecycleListener"/>
     </applicationListeners>
 </idea-plugin>
\ No newline at end of file