diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 2dfb067fede..62193c8caf4 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-02 Bogdan Gheorghe
+	
+	Fix for Bug 61241 - [Search] Closing the Search view mid search causes an error
+	* src/org/eclipse/cdt/internal/ui/search/CSearchTableContentProvider.java
+	
 2004-06-01 Alain Magloire
 
 	Format the source Hovering better.
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTableContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTableContentProvider.java
index e684cfa8fb5..00889bf9b2c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTableContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchTableContentProvider.java
@@ -27,6 +27,9 @@ public class CSearchTableContentProvider extends CSearchContentProvider implemen
 	}
 
 	public void elementsChanged(Object[] updatedElements) {
+		if (_result == null)
+			return;
+		
 		int addCount= 0;
 		int removeCount= 0;
 		for (int i= 0; i < updatedElements.length; i++) {