diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java
index edcf8da..d1e05ce 100644
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/FilterRule.java
@@ -444,12 +444,19 @@
 			
 			//Dispay facet Labels when selecting Settings
 			if(_facetLabel == null){
-				IProjectFacet facet = ProjectFacetsManager.getProjectFacet(_pattern);
-				facetLabel = facet.getLabel();
+				try
+				{
+					IProjectFacet facet = ProjectFacetsManager.getProjectFacet(_pattern);
+					facetLabel = facet.getLabel();		
+				} catch(IllegalArgumentException ex) {
+					//do nothing
+				}				
 			}
-
-			b.append(facetLabel);
-			b.append(" - "); //$NON-NLS-1$
+			
+			if(facetLabel != null && facetLabel.length() > 0){
+				b.append(facetLabel);
+				b.append(" - "); //$NON-NLS-1$
+			}
 			
 			b.append(_pattern);
 			
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java
index 4ecb4ca..06f03ad 100644
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/model/ValidatorHelper.java
@@ -73,9 +73,15 @@
 	 */
 	public static String getRuntimeName(String id)
 	{
-		IRuntime runtime = RuntimeManager.getRuntime(id);
-		if(runtime != null)
-			return runtime.getLocalizedName();
+		try
+		{
+			IRuntime runtime = RuntimeManager.getRuntime(id);
+			if(runtime != null)
+				return runtime.getLocalizedName();
+			
+		} catch(IllegalArgumentException ex){
+			//do nothing
+		}
 		
 		return null;
 	}
