[300387] Need to protect against NPE in adopter J2EEElementChangedListener
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
index c718d59..5642150 100644
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
+++ b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
@@ -326,11 +326,13 @@
 					sourceToRuntime.put(resource.getSourcePath().makeRelative(), resource.getRuntimePath());
 				}
 			}
-			return sourceToRuntime;
+		} catch (NullPointerException e) {
+			J2EEPlugin.logError(e);
 		} finally {
 			if (core != null)
 				core.dispose();
 		}
+		return sourceToRuntime;
 	}
 
 	/*