diff --git a/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs b/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs
index ac67ffbe72..333b05a8d9 100644
--- a/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs
+++ b/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs
@@ -154,14 +154,15 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 		
 		void BookmarkManagerAdded(object sender, BookmarkEventArgs e)
 		{
-			AddMark((SDBookmark)e.Bookmark);
+			AddMark(e.Bookmark);
 		}
 		
 		void BookmarkManagerRemoved(object sender, BookmarkEventArgs e)
 		{
 			if (ShowBookmarkInThisPad(e.Bookmark)) {
 				var model = listView.Remove(e.Bookmark);
-				model.PropertyChanged -= OnModelPropertyChanged;
+				if (model != null)
+					model.PropertyChanged -= OnModelPropertyChanged;
 			}
 		}