diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java
index 87d27c226dd..b87eab7cfaf 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java
@@ -713,10 +713,7 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt
 			    if (context instanceof IRemoteFile)
 			    {			        
 			        IRemoteFile cwd = (IRemoteFile)context;
-			        if (cwd != null)
-			        {	
-			        	return cwd.getAbsolutePath();			        
-			        }	
+		        	return cwd.getAbsolutePath();			        
 			    }
 			    else
 			     {
@@ -724,6 +721,6 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt
 			     }
 			}
 		}
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 }
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java
index 2c7e8c271d8..bf8260a8057 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java
@@ -594,12 +594,9 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd
 				if (context instanceof IRemoteFile)
 				{
 					IRemoteFile pwdf = (IRemoteFile) context;
-					if (pwdf != null)
-					{
-						String pwd = pwdf.getAbsolutePath();
-						shellBuffer.append(pwd);
-						gotShell = true;
-					}
+					String pwd = pwdf.getAbsolutePath();
+					shellBuffer.append(pwd);
+					gotShell = true;
 				}
 				else
 				{