From e0abfeeee9b667ce440aebbdc887ed1efbdc907c Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Thu, 13 Apr 2017 16:57:52 +0200
Subject: [PATCH] Fix possible exception

---
 .../terminal/LocalTerminalDirectRunner.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
index 8a19ebdba87e..7a81f2e31a89 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -17,7 +17,6 @@ package org.jetbrains.plugins.terminal;
 
 import com.google.common.collect.Lists;
 import com.intellij.execution.TaskExecutor;
-import com.intellij.execution.configurations.EncodingEnvironmentUtil;
 import com.intellij.execution.process.ProcessAdapter;
 import com.intellij.execution.process.ProcessEvent;
 import com.intellij.execution.process.ProcessHandler;
@@ -71,8 +70,13 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
     return name.equals("bash") || name.equals("sh") || name.equals("zsh");
   }
 
-  private static String getShellName(String path) {
-    return new File(path).getName();
+  private static String getShellName(@Nullable String path) {
+    if (path == null) {
+      return null;
+    }
+    else {
+      return new File(path).getName();
+    }
   }
 
   private static String findRCFile(String shellName) {
@@ -181,9 +185,8 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
     if (SystemInfo.isUnix) {
       List<String> command = Lists.newArrayList(shellPath.split(" "));
 
-      String shellCommand = command.get(0);
-      String shellName = command.size() > 0 ? getShellName(shellCommand) : null;
-
+      String shellCommand = command.size() > 0 ? command.get(0) : null;
+      String shellName = getShellName(shellCommand);
 
       if (shellName != null) {
         command.remove(0);