diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPropertyPage.java
index 65423c646f3..aa1b7de7e16 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPropertyPage.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPropertyPage.java
@@ -368,12 +368,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement
 		fIgnoreCount = new BreakpointIntegerFieldEditor( ICBreakpoint.IGNORE_COUNT, BreakpointsMessages.getString( "CBreakpointPropertyPage.17" ), parent ); //$NON-NLS-1$
 		fIgnoreCount.setValidRange( 0, Integer.MAX_VALUE );
 		fIgnoreCountTextControl = fIgnoreCount.getTextControl( parent );
-		try {
-			fIgnoreCountTextControl.setEnabled( getBreakpoint().getIgnoreCount() >= 0 );
-		}
-		catch( CoreException ce ) {
-			CDebugUIPlugin.log( ce );
-		}
+		fIgnoreCountTextControl.setEnabled( getPreferenceStore().getInt(ICBreakpoint.IGNORE_COUNT) >= 0 );
 		addField( fIgnoreCount );
 	}
 
@@ -421,7 +416,7 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement
         if (store instanceof CBreakpointPreferenceStore) {
             ((CBreakpointPreferenceStore)store).setCanceled(false);
         }
-        return super.performCancel();
+        return super.performOk();
     }
 
 	/* (non-Javadoc)
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java
index 71c403dc47d..919609eeea6 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java
@@ -90,13 +90,13 @@ abstract public class AbstractToggleBreakpointAdapter
     
     @Override
     public void toggleBreakpointsWithEvent(IWorkbenchPart part, ISelection selection, Event event) throws CoreException {
-        if((event.stateMask & SWT.MOD2) > 0) {
+        if(event != null && (event.stateMask & SWT.MOD2) > 0) {
             if (toggleBreakpointEnable(part)) {
                 return;
             }
         }
         else {
-            boolean interactive = (event.stateMask & SWT.MOD1) > 0;
+            boolean interactive = event != null && (event.stateMask & SWT.MOD1) > 0;
             updateBreakpoints(true, interactive, part, selection);
         }
     }