From b7d7ab022cee9a96373007f095ca3075303d98af Mon Sep 17 00:00:00 2001
From: Valentina Kiryushkina <valentina.kiryushkina@jetbrains.com>
Date: Fri, 3 Feb 2017 12:36:01 +0300
Subject: [PATCH] PY-22559 NotNullize working directory

---
 .../plugins/ipnb/configuration/IpnbConfigurable.java          | 2 +-
 .../jetbrains/plugins/ipnb/configuration/IpnbSettings.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java
index d2ff966666c8..f2e71742e9c6 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConfigurable.java
@@ -50,7 +50,7 @@ public class IpnbConfigurable implements SearchableConfigurable {
   @Override
   public boolean isModified() {
     final String oldUrl = IpnbSettings.getInstance(myProject).getURL();
-    final String oldWorkingDirectory = StringUtil.notNullize(IpnbSettings.getInstance(myProject).getWorkingDirectory());
+    final String oldWorkingDirectory = IpnbSettings.getInstance(myProject).getWorkingDirectory();
     final String oldArguments = StringUtil.notNullize(IpnbSettings.getInstance(myProject).getArguments());
 
     final String url = StringUtil.trimEnd(StringUtil.notNullize(myFieldUrl.getText()), "/");
diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbSettings.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbSettings.java
index 33071d3c228c..a4dc8abca3dd 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbSettings.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbSettings.java
@@ -37,9 +37,9 @@ public class IpnbSettings implements PersistentStateComponent<IpnbSettings> {
     myWorkingDirectory = workingDirectory;
   }
 
-  @Nullable
+  @NotNull
   public String getWorkingDirectory() {
-    return myWorkingDirectory;
+    return StringUtil.notNullize(myWorkingDirectory);
   }
 
   public String getArguments() {