[122107] Migration fixes and tests

tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/tests/Migrate07EJBTest.java

diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/tests/Migrate07EJBTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/tests/Migrate07EJBTest.java
index 3d46945..6e4d96a 100644
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/tests/Migrate07EJBTest.java
+++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/tests/Migrate07EJBTest.java
@@ -56,11 +56,15 @@
 
 				try {
 				ejbedit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
-				EJBJar ejb = ejbedit.getEJBJar();
-				assertTrue(ejb != null);
+				if (ejbedit != null) {
+					EJBJar ejb = ejbedit.getEJBJar();
+					assertTrue(ejb != null);
+				}
 				webEdit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
-				WebApp web = webEdit.getWebApp();
-				assertTrue(web != null);
+				if (webEdit != null) {
+					WebApp web = webEdit.getWebApp();
+					assertTrue(web != null);
+				}
 				} finally {
 					if (ejbedit != null) {
 						ejbedit.dispose();