diff --git a/python/pydevSrc/com/jetbrains/python/debugger/PyThreadInfo.java b/python/pydevSrc/com/jetbrains/python/debugger/PyThreadInfo.java
index c01be15384ab..7fffc636a9fb 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/PyThreadInfo.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/PyThreadInfo.java
@@ -80,7 +80,7 @@ public class PyThreadInfo {
   }
 
   public boolean isExceptionBreak() {
-    return myStopReason == AbstractCommand.ADD_EXCEPTION_BREAKPOINT || myStopReason == AbstractCommand.ADD_DJANGO_EXCEPTION_BREAKPOINT;
+    return myStopReason == AbstractCommand.ADD_EXCEPTION_BREAKPOINT;
   }
 
   @Override
diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/AbstractCommand.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/AbstractCommand.java
index b1fd58c4bd10..d13addaade04 100644
--- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/AbstractCommand.java
+++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/AbstractCommand.java
@@ -28,13 +28,9 @@ public abstract class AbstractCommand<T> {
   public static final int ADD_EXCEPTION_BREAKPOINT = 122;
   public static final int REMOVE_EXCEPTION_BREAKPOINT = 123;
   public static final int LOAD_SOURCE = 124;
-  public static final int ADD_DJANGO_EXCEPTION_BREAKPOINT = 125;
-  public static final int REMOVE_DJANGO_EXCEPTION_BREAKPOINT = 126;
   public static final int SMART_STEP_INTO = 128;
   public static final int EXIT = 129;
   public static final int CALL_SIGNATURE_TRACE = 130;
-  public static final int ADD_JINJA2_EXCEPTION_BREAKPOINT = 131;
-  public static final int REMOVE_JINJA2_EXCEPTION_BREAKPOINT = 132;
   public static final int CMD_RUN_CUSTOM_OPERATION = 135;
   public static final int SHOW_CONSOLE = 142;
   public static final int ERROR = 901;
diff --git a/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointProperties.java b/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointProperties.java
index 7799cfccdfa3..93f9d89e386c 100644
--- a/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointProperties.java
+++ b/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointProperties.java
@@ -79,6 +79,10 @@ public class PyExceptionBreakpointProperties extends ExceptionBreakpointProperti
     myNotifyOnlyOnFirst = notifyOnlyOnFirst;
   }
 
+  public String getException() {
+    return "python-" + myException;
+  }
+
   @Override
   public ExceptionBreakpointCommand createAddCommand(RemoteDebugger debugger) {
     return ExceptionBreakpointCommand.addExceptionBreakpointCommand(debugger, getException(),