diff --git a/python/helpers/pydev/pydevd.py b/python/helpers/pydev/pydevd.py
index 94b572d412aa..317af29a1997 100644
--- a/python/helpers/pydev/pydevd.py
+++ b/python/helpers/pydev/pydevd.py
@@ -811,6 +811,8 @@ class PyDB:
                             frame.f_lineno = line
                             frame.f_trace = None
                             stop = True
+                    else:
+                        response_msg = "jump is available only within the bottom frame"
                 except ValueError as e:
                     response_msg = "%s" % e
                     info.pydev_state = STATE_SUSPEND
@@ -823,9 +825,9 @@ class PyDB:
                 cmd = self.cmd_factory.make_thread_run_message(get_thread_id(thread), info.pydev_step_cmd)
                 self.writer.add_command(cmd)
                 info.pydev_step_cmd = None
+                info.pydev_state = STATE_SUSPEND
 
                 if stop:
-                    info.pydev_state = STATE_SUSPEND
                     thread.stop_reason = CMD_THREAD_SUSPEND
 
                 # return to the suspend state and wait for other command
diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
index aab0dc7401e4..071e91c7ae85 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
@@ -336,7 +336,7 @@ public class RemoteDebugger implements ProcessDebugger {
       try {
         command.execute();
       }
-      catch (PyDebuggerException e) {
+      catch (Exception e) {
         LOG.error(e);
       }
       finally {
diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/SetNextStatementCommand.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/SetNextStatementCommand.java
index c32380b5a1a9..0fd93ab4acdb 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/SetNextStatementCommand.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/SetNextStatementCommand.java
@@ -53,6 +53,7 @@ public class SetNextStatementCommand extends AbstractThreadCommand {
   @Override
   protected void buildPayload(Payload payload) {
     super.buildPayload(payload);
-    payload.add(myLine + 1).add(myFunctionName);
+    String functionName = myFunctionName != null ? myFunctionName : "None";
+    payload.add(myLine + 1).add(functionName);
   }
 }