diff --git a/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStore.java b/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStore.java
index c207d1e6e51..0d026997969 100644
--- a/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStore.java
+++ b/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStore.java
@@ -22,6 +22,7 @@
  * Kevin Doyle 		(IBM)		 - [210673] [efs][nls] Externalize Strings in RSEFileStore and RSEFileStoreImpl
  * Timur Shipilov   (Xored)      - [224538] RSEFileStore.getParent() returns null for element which is not root of filesystem
  * David McKnight   (IBM)        - [287185] EFS provider should interpret the URL host component as RSE connection name rather than a hostname
+ * David McKnight  (IBM)         - [291738] [efs] repeated queries to RSEFileStoreImpl.fetchInfo() in short time-span should be reduced
  ********************************************************************************/
 
 package org.eclipse.rse.internal.efs;
@@ -243,14 +244,13 @@ public class RSEFileStore extends FileStore
 			Bundle[] bundles = ctx.getBundles();
 			for (int i=0; i<bundles.length; i++) {
 				if ("org.eclipse.core.resources".equals(bundles[i].getSymbolicName())) { //$NON-NLS-1$
-					if (resourcesBundle==null || bundles[i].getState()==Bundle.ACTIVE) {
+					if (resourcesBundle==null && bundles[i].getState()==Bundle.ACTIVE) {
 						resourcesBundle = bundles[i];
 					}
-					//System.out.println(resourcesBundle);
 				}
 			}
 		}
-		return resourcesBundle.getState()==Bundle.ACTIVE;
+		return resourcesBundle != null && resourcesBundle.getState()==Bundle.ACTIVE;
 	}
 
 	/*
diff --git a/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStoreImpl.java b/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStoreImpl.java
index a6d642b41d4..5cd78b00e40 100644
--- a/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStoreImpl.java
+++ b/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RSEFileStoreImpl.java
@@ -32,6 +32,7 @@
  * Martin Oberhuber (Wind River) - [220300] EFS Size Property not properly updated after saving
  * Martin Oberhuber (Wind River) - [234026] Clarify IFileService#createFolder() Javadocs
  * David McKnight  (IBM)         - [287185] EFS provider should interpret the URL host component as RSE connection name rather than a hostname
+ * David McKnight  (IBM)         - [291738] [efs] repeated queries to RSEFileStoreImpl.fetchInfo() in short time-span should be reduced
  ********************************************************************************/
 
 package org.eclipse.rse.internal.efs;
@@ -79,6 +80,7 @@ import org.eclipse.rse.ui.RSEUIPlugin;
 public class RSEFileStoreImpl extends FileStore
 {
 	private RSEFileStore _store;
+	private long _lastFetch = 0;
 
 	//cached IRemoteFile object: an Object to avoid early class loading
 	private transient volatile IRemoteFile _remoteFile;
@@ -514,8 +516,14 @@ public class RSEFileStoreImpl extends FileStore
 	 * @see org.eclipse.core.filesystem.IFileStore#fetchInfo(int, org.eclipse.core.runtime.IProgressMonitor)
 	 */
 	public IFileInfo fetchInfo(int options, IProgressMonitor monitor) throws CoreException {
-		// clear cache in order to query latest info
-		cacheRemoteFile(null);
+		long curTime = System.currentTimeMillis();
+		// don't clear cache when there are several successive queries in a short time-span
+		if (_lastFetch == 0 || ((curTime - _lastFetch) < 1000)){	
+			// clear cache in order to query latest info
+			cacheRemoteFile(null);
+			_lastFetch = curTime;
+		}
+
 		// connect if needed. Will throw exception if not successful.
 		IRemoteFile remoteFile = getRemoteFileObject(monitor, false);
 		String classification = (remoteFile==null) ? null : remoteFile.getClassification();
diff --git a/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RemoteEditorManager.java b/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RemoteEditorManager.java
index 1038d946228..47263e11481 100644
--- a/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RemoteEditorManager.java
+++ b/rse/plugins/org.eclipse.rse.efs/src/org/eclipse/rse/internal/efs/RemoteEditorManager.java
@@ -11,6 +11,7 @@
  * Contributors:
  * Mike Kucera         (IBM) - [241316] [efs] Cannot restore editors for RSE/EFS-backed resources
  * David McKnight      (IBM) - [241316] [efs] Cannot restore editors for RSE/EFS-backed resources
+ * David McKnight  (IBM)         - [291738] [efs] repeated queries to RSEFileStoreImpl.fetchInfo() in short time-span should be reduced
  ********************************************************************************/
 package org.eclipse.rse.internal.efs;
 
@@ -204,9 +205,11 @@ public class RemoteEditorManager implements ISaveParticipant, IResourceChangeLis
 						if (input instanceof FileEditorInput){
 							IFile file = ((FileEditorInput)input).getFile();
 							URI uri = file.getLocationURI();
-							if ("rse".equals(uri.getScheme())) { //$NON-NLS-1$
-								IEditorPart editor = editorReference.getEditor(false);
-								callback.apply(page, editor, file);
+							if (uri != null && uri.getScheme() != null){
+								if ("rse".equals(uri.getScheme())) { //$NON-NLS-1$
+									IEditorPart editor = editorReference.getEditor(false);
+									callback.apply(page, editor, file);																
+								}
 							}
 						}
 					} catch (PartInitException e){