[153645] Search scope can be null if participant initialization fails
diff --git a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchEngine.java b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchEngine.java
index ef4f51a..3fed117 100644
--- a/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchEngine.java
+++ b/plugins/org.eclipse.wst.common.core/src-search/org/eclipse/wst/common/core/search/SearchEngine.java
@@ -137,7 +137,16 @@
{ participant.getDescription() }));
// a search document set should contain enough info to reduce the search scope even further
// before finding precize locations
- participant.locateMatches(set, pattern, scopeArray[i], requestor, searchOptions, subMonitor);
+
+ // the scope could be null if the partcipant barfed and exeption in the first loop
+ if (scopeArray[i] != null)
+ {
+ participant.locateMatches(set, pattern, scopeArray[i], requestor, searchOptions, subMonitor);
+ }
+ }
+ catch (Exception e)
+ {
+
}
finally
{
