diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java
index 1917105..6a9d1db 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java
@@ -46,6 +46,8 @@
 	 * The latest version value.
 	 */
 	public static final int	   LATESTVERSION = 2;
+
+	private static final int NO_VERSION = 0;
 	
 	private static JSFLibraryRegistryUpgradeUtil INSTANCE;
 		
@@ -81,7 +83,7 @@
 		{
 			int curVersion = getCurVersion();
 			
-			if (curVersion < expectedVersion)
+			if (curVersion < expectedVersion && curVersion != NO_VERSION)
 			{
 				UpgradeOperation op = getUpgradeOperation(curVersion);
 				
@@ -133,7 +135,14 @@
 		{
 			return 2;
 		}
-		return 1;
+		
+		URI v1File = getRegistryURI(JSF_LIBRARY_REGISTRY_V1_URL);
+		file = new File(v1File.toFileString());
+		if (file.exists())
+		{
+			return 1;
+		}
+		return NO_VERSION;
 	}
 	
 	/**