diff --git a/src/Main/Base/Project/Src/Commands/DebugCommands.cs b/src/Main/Base/Project/Src/Commands/DebugCommands.cs index f06e420d1f..0cebe5234a 100644 --- a/src/Main/Base/Project/Src/Commands/DebugCommands.cs +++ b/src/Main/Base/Project/Src/Commands/DebugCommands.cs @@ -132,9 +132,13 @@ namespace ICSharpCode.SharpDevelop.Project.Commands { public override void Run() { - var bookmarkBase = (BookmarkPadBase)Owner; + if (Owner == null || !(Owner is BookmarkPadBase)) return; + + var bookmarkBase = (BookmarkPadBase)Owner; var item = bookmarkBase.CurrentItem; + if (item == null) return; + if (item.Mark is BreakpointBookmark) { BookmarkManager.RemoveMark(item.Mark); }