diff --git a/src/main/java/net/wasdev/wlp/ant/types/EmbeddedServerInfo.java b/src/main/java/net/wasdev/wlp/ant/types/EmbeddedServerInfo.java
index 04822784..36badaff 100644
--- a/src/main/java/net/wasdev/wlp/ant/types/EmbeddedServerInfo.java
+++ b/src/main/java/net/wasdev/wlp/ant/types/EmbeddedServerInfo.java
@@ -50,8 +50,12 @@ public File getOutputDir() {
     public boolean equals(EmbeddedServerInfo info) {
         return 
             this.serverName.equals(info.serverName)
-            && this.userDir.getAbsolutePath().equals(info.userDir.getAbsolutePath())
-            && this.outputDir.getAbsolutePath().equals(info.outputDir.getAbsolutePath());
+            && ( (this.userDir == null && info.userDir == null) ||
+                 (this.userDir != null && info.userDir != null && 
+                  this.userDir.getAbsolutePath().equals(info.userDir.getAbsolutePath())) )
+            && ( (this.outputDir == null && info.outputDir == null) ||
+                 (this.outputDir != null && info.outputDir != null && 
+                  this.outputDir.getAbsolutePath().equals(info.outputDir.getAbsolutePath())) );
     }
 
     public static class EmbeddedServers {