diff --git a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
index f1ef38a2a38c..6c197885bac5 100644
--- a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
+++ b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
@@ -544,22 +544,16 @@ public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, Pr
   }
 
   public void addExceptionBreakpoint(XBreakpoint<? extends ExceptionBreakpointProperties> breakpoint) {
-    ExceptionBreakpointProperties properties = breakpoint.getProperties();
-    if (properties == null) return;
-    
-    myRegisteredExceptionBreakpoints.put(properties.getException(), breakpoint);
+    myRegisteredExceptionBreakpoints.put(breakpoint.getProperties().getException(), breakpoint);
     if (isConnected()) {
-      myDebugger.addExceptionBreakpoint(properties);
+      myDebugger.addExceptionBreakpoint(breakpoint.getProperties());
     }
   }
 
   public void removeExceptionBreakpoint(XBreakpoint<? extends ExceptionBreakpointProperties> breakpoint) {
-    ExceptionBreakpointProperties properties = breakpoint.getProperties();
-    if (properties == null) return;
-
-    myRegisteredExceptionBreakpoints.remove(properties.getException());
+    myRegisteredExceptionBreakpoints.remove(breakpoint.getProperties().getException());
     if (isConnected()) {
-      myDebugger.removeExceptionBreakpoint(properties);
+      myDebugger.removeExceptionBreakpoint(breakpoint.getProperties());
     }
   }
 
diff --git a/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointType.java b/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointType.java
index d30aad7eac9c..c19e1d2f8273 100644
--- a/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointType.java
+++ b/python/src/com/jetbrains/python/debugger/PyExceptionBreakpointType.java
@@ -225,24 +225,18 @@ public class PyExceptionBreakpointType
 
     @Override
     public void saveTo(@NotNull XBreakpoint<PyExceptionBreakpointProperties> breakpoint) {
-      PyExceptionBreakpointProperties properties = breakpoint.getProperties();
-      if (properties == null) return;
-      
-      properties.setNotifyOnTerminate(myNotifyOnTerminateCheckBox.isSelected());
+      breakpoint.getProperties().setNotifyOnTerminate(myNotifyOnTerminateCheckBox.isSelected());
 
-      properties.setNotifyAlways(myNotifyOnRaiseCheckBox.isSelected() && myAlwaysRadio.isSelected());
-      properties.setNotifyOnlyOnFirst(myNotifyOnRaiseCheckBox.isSelected() && myOnlyOnFirstRadio.isSelected());
+      breakpoint.getProperties().setNotifyAlways(myNotifyOnRaiseCheckBox.isSelected() && myAlwaysRadio.isSelected());
+      breakpoint.getProperties().setNotifyOnlyOnFirst(myNotifyOnRaiseCheckBox.isSelected() && myOnlyOnFirstRadio.isSelected());
     }
 
     @Override
     public void loadFrom(@NotNull XBreakpoint<PyExceptionBreakpointProperties> breakpoint) {
-      PyExceptionBreakpointProperties properties = breakpoint.getProperties();
-      if (properties == null) return;
-      
-      myNotifyOnTerminateCheckBox.setSelected(properties.isNotifyOnTerminate());
+      myNotifyOnTerminateCheckBox.setSelected(breakpoint.getProperties().isNotifyOnTerminate());
 
-      boolean always = properties.isNotifyAlways();
-      boolean onFirst = properties.isNotifyOnlyOnFirst();
+      boolean always = breakpoint.getProperties().isNotifyAlways();
+      boolean onFirst = breakpoint.getProperties().isNotifyOnlyOnFirst();
 
       setNotifyOnRaiseSelected(always || onFirst);