diff --git a/flutter-idea/src/io/flutter/FlutterBundle.properties b/flutter-idea/src/io/flutter/FlutterBundle.properties
index 2b49eaa35b..c8efe595ca 100644
--- a/flutter-idea/src/io/flutter/FlutterBundle.properties
+++ b/flutter-idea/src/io/flutter/FlutterBundle.properties
@@ -11,7 +11,7 @@ app.restart.action.description=Restart the Flutter app
 app.restart.all.action.text=Flutter Hot Restart (All Devices)
 app.restart.all.action.description=Restart all running Flutter apps on all connected devices
 
-app.profile.action.text=Run in Flutter profile mode
+app.profile.action.text=Run in Flutter Profile Mode
 app.profile.config.action.text=Flutter Run ''{0}'' in Profile Mode
 app.profile.action.description=Run Flutter app in profile mode
 
diff --git a/flutter-idea/src/io/flutter/actions/RestartFlutterAppRetarget.java b/flutter-idea/src/io/flutter/actions/RestartFlutterAppRetarget.java
index 60409f06ab..cdfd26b386 100644
--- a/flutter-idea/src/io/flutter/actions/RestartFlutterAppRetarget.java
+++ b/flutter-idea/src/io/flutter/actions/RestartFlutterAppRetarget.java
@@ -8,7 +8,7 @@
 import com.intellij.openapi.actionSystem.ActionPlaces;
 
 /**
- * A keystroke or tool-bar invoked {@link RestartFlutterApp} action.
+ * A keystroke or toolbar invoked {@link RestartFlutterApp} action.
  */
 public class RestartFlutterAppRetarget extends FlutterRetargetAppAction {
   public RestartFlutterAppRetarget() {
diff --git a/flutter-idea/src/io/flutter/actions/RunFlutterAction.java b/flutter-idea/src/io/flutter/actions/RunFlutterAction.java
index 12c07e1fc5..1276631190 100644
--- a/flutter-idea/src/io/flutter/actions/RunFlutterAction.java
+++ b/flutter-idea/src/io/flutter/actions/RunFlutterAction.java
@@ -28,6 +28,7 @@
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public abstract class RunFlutterAction extends AnAction {
   private final @NotNull String myDetailedTextKey;
@@ -62,6 +63,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
     }
 
     final SdkRunConfig sdkRunConfig = (SdkRunConfig)configuration.clone();
+    assert sdkRunConfig != null;
     final SdkFields fields = sdkRunConfig.getFields();
     final String additionalArgs = fields.getAdditionalArgs();
 
@@ -153,7 +155,8 @@ public static RunnerAndConfigurationSettings getRunConfigSettings(@Nullable AnAc
 
   @Nullable
   public static Executor getExecutor(@NotNull String executorId) {
-    for (Executor executor : Executor.EXECUTOR_EXTENSION_NAME.getExtensions()) {
+    for (Executor executor : Objects.requireNonNull(Executor.EXECUTOR_EXTENSION_NAME.getExtensions())) {
+      assert executor != null;
       if (executorId.equals(executor.getId())) {
         return executor;
       }