diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java
index e9e91054dac..ceb69328832 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/core/model/SystemRegistry.java
@@ -893,6 +893,8 @@ public class SystemRegistry implements ISystemRegistry
 	 * @since org.eclipse.rse.core 3.0
 	 */
 	public static ISystemDragDropAdapter getSystemDragDropAdapter(Object element) {
+		if (element == null)
+			return null;
 		Object adapter = null;
 		if (element instanceof IAdaptable) {
 			IAdaptable adaptable = (IAdaptable) element;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java
index 3fa919d83cd..395698d093d 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableViewPart.java
@@ -1676,7 +1676,7 @@ public class SystemTableViewPart extends ViewPart
 		// right now assuming only one resource
 		String oldName = (oldNames == null) ? null : oldNames[0];
 		boolean referToSameObject = false;
-		if (oldName != null){
+		if (input != null && oldName != null){
 			referToSameObject = SystemRegistry.isSameObjectByAbsoluteName(input, null, child, oldName);
 		}