diff --git a/VERSION.txt b/VERSION.txt
index 97bb8f22a46..c645873acbf 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -3,6 +3,7 @@ jetty-7.0.0.M4-SNAPSHOT
  + JETTY-1042 Prevent cookie leak between shared connection
  + JETTY-1048 Fix for large partially filtered static content
  + JETTY-1049 Improved transparent proxy usability
+ + JETTY-1054 Avoid double deploys
 
 jetty-7.0.0.M3 20 June 2009
  + fixed race with expired async listeners
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
index 540f6ee939f..922810c67e9 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
@@ -22,6 +22,7 @@ import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.util.AttributesMap;
 import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.component.AbstractLifeCycle;
+import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.webapp.WebAppContext;
 
@@ -223,18 +224,26 @@ public class WebAppDeployer extends AbstractLifeCycle
                 for (int i=0; i<installed.length; i++)
                 {
                     ContextHandler c=(ContextHandler)installed[i];
-        
+
                     if (context.equals(c.getContextPath()))
                         continue files;
                     
-                   String path;
-                   if (c instanceof WebAppContext)
-                       path = ((WebAppContext)c).getWar();
-                   else
-                       path = (c.getBaseResource()==null?"":c.getBaseResource().getFile().getAbsolutePath());
+                   try
+                   {
+                       String path=null;
+                       if (c instanceof WebAppContext)
+                           path = Resource.newResource(((WebAppContext)c).getWar()).getFile().getAbsolutePath();
+                       else if (c.getBaseResource()!=null)
+                           path = c.getBaseResource().getFile().getAbsolutePath();
 
-                    if (path.equals(app.getFile().getAbsolutePath()))
-                        continue files;
+                       if (path!=null && path.equals(app.getFile().getAbsolutePath()))
+                           continue files;
+                   }
+                   catch (Exception e)
+                   {
+                       Log.ignore(e);
+                   }
+                   
    
                 }
             }