Fixed "Bug 1679 - Exception while clicking on errors".

1 files changed, 4 insertions, 4 deletions

diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
index 7196785275..3c03c94bd9 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
@@ -257,20 +257,20 @@ namespace MonoDevelop.SourceEditor
 
 		void HandleTaskServiceJumpedToTask (object sender, TaskEventArgs e)
 		{
-			Task task = e.Tasks.FirstOrDefault ();
+			var task = e.Tasks != null ? e.Tasks.FirstOrDefault () : null;
 			var doc = Document;
 			if (task == null || doc == null || task.FileName != doc.FileName || this.TextEditor == null)
 				return;
-			LineSegment lineSegment = doc.GetLine (task.Line);
+			var lineSegment = doc.GetLine (task.Line);
 			if (lineSegment == null)
 				return;
-			MessageBubbleTextMarker marker = (MessageBubbleTextMarker)lineSegment.Markers.FirstOrDefault (m => m is MessageBubbleTextMarker);
+			var marker = (MessageBubbleTextMarker)lineSegment.Markers.FirstOrDefault (m => m is MessageBubbleTextMarker);
 			if (marker == null)
 				return;
 			
 			marker.SetPrimaryError (task.Description);
 			
-			if (TextEditor.IsComposited) {
+			if (TextEditor != null && TextEditor.IsComposited) {
 				if (messageBubbleHighlightPopupWindow != null)
 					messageBubbleHighlightPopupWindow.Destroy ();
 				messageBubbleHighlightPopupWindow = new MessageBubbleHighlightPopupWindow (this, marker);