diff --git a/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java b/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java
index 853a9724d63d..6964d66d4ef0 100644
--- a/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java
+++ b/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java
@@ -190,16 +190,16 @@ public abstract class ToolbarDecorator implements CommonActionsPanel.ListenerFac
     return setToolbarBorder(new CustomLineBorder(top, left, bottom, right));
   }
 
-  public ToolbarDecorator addExtraAction(AnActionButton action) {
-    if (action != null) {
-      myExtraActions.add(action);
-    }
+  public ToolbarDecorator addExtraAction(@NotNull AnActionButton action) {
+    myExtraActions.add(action);
     return this;
   }
 
   public ToolbarDecorator addExtraActions(AnActionButton... actions) {
     for (AnActionButton action : actions) {
-      addExtraAction(action);
+      if (action != null) {
+        addExtraAction(action);
+      }
     }
     return this;
   }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxArtifactPropertiesEditor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxArtifactPropertiesEditor.java
index e4a7b47b673c..da7ac9794849 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxArtifactPropertiesEditor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/packaging/JavaFxArtifactPropertiesEditor.java
@@ -317,7 +317,7 @@ public class JavaFxArtifactPropertiesEditor extends ArtifactPropertiesEditor {
 
       @Override
       protected boolean isEmpty(JavaFxManifestAttribute element) {
-        return element.getName().isEmpty() && element.getValue().isEmpty();
+        return StringUtil.isEmpty(element.getName()) && StringUtil.isEmpty(element.getValue());
       }
 
       @Override
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/ManageTemplateVariablesDialog.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/ManageTemplateVariablesDialog.java
index ebb8bd39997b..17d966b65d3e 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/ManageTemplateVariablesDialog.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/ManageTemplateVariablesDialog.java
@@ -2,6 +2,7 @@ package com.intellij.tasks.generic;
 
 import com.intellij.execution.util.ListTableWithButtons;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ui.AbstractTableCellEditor;
 import com.intellij.util.ui.ColumnInfo;
 import com.intellij.util.ui.ListTableModel;
@@ -208,7 +209,7 @@ public class ManageTemplateVariablesDialog extends DialogWrapper {
 
     @Override
     protected boolean isEmpty(TemplateVariable element) {
-      return element.getName().isEmpty() && element.getValue().isEmpty();
+      return StringUtil.isEmpty(element.getName()) && StringUtil.isEmpty(element.getValue());
     }
 
     @Override
diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
index 11cc0d798e58..4459d2e7d4cc 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
@@ -109,7 +109,11 @@ public class RemoteDebugger implements ProcessDebugger {
   public String handshake() throws PyDebuggerException {
     final VersionCommand command = new VersionCommand(this, LOCAL_VERSION, SystemInfo.isUnix ? "UNIX" : "WIN");
     command.execute();
-    return command.getRemoteVersion();
+    String version = command.getRemoteVersion();
+    if (version != null) {
+      version = version.trim();
+    }
+    return version;
   }
 
   @Override