*** empty log message ***
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/MinimalState.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/MinimalState.java
index 2c96823..514219e 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/MinimalState.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/MinimalState.java
@@ -98,7 +98,6 @@
 			model.setBundleDescription(
 					addBundle(new File(model.getInstallLocation()), false,  bundleId));
 		} catch (PluginConversionException e) {
-			PDECore.log(e);
 		} catch (CoreException e) {
 			PDECore.log(e);
 		}
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/WorkspaceModelManager.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/WorkspaceModelManager.java
index 09bb403..a1a8832 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/WorkspaceModelManager.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/WorkspaceModelManager.java
@@ -289,7 +289,8 @@
 	
 	private void handleFileChanged(IFile file, IResourceDelta delta) {
 		IModel model = getWorkspaceModel(file);
-		if (model == null) {
+		if (model == null
+				|| (model instanceof WorkspacePluginModelBase && file.getName().equals("MANIFEST.MF"))) {
 			addWorkspaceModel(file.getProject(), true);
 			return;
 		}