diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/condition/IsPingable.java b/src/main/org/apache/tools/ant/taskdefs/optional/condition/IsPingable.java
index 8084522fa..5e489a790 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/condition/IsPingable.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/condition/IsPingable.java
@@ -71,7 +71,7 @@ public class IsPingable extends ProjectComponent implements Condition  {
      *          if an error occurs
      */
     public boolean eval() throws BuildException {
-        if(host==null && host.length()==0) {
+        if(host==null || host.length()==0) {
             throw new BuildException(ERROR_NO_HOSTNAME);
         }
         if(timeout<0) {
diff --git a/src/main/org/apache/tools/ant/types/defaults.properties b/src/main/org/apache/tools/ant/types/defaults.properties
index 55f1e96e5..126314acb 100644
--- a/src/main/org/apache/tools/ant/types/defaults.properties
+++ b/src/main/org/apache/tools/ant/types/defaults.properties
@@ -33,3 +33,4 @@ scriptfilter=org.apache.tools.ant.types.optional.ScriptFilter
 propertyset=org.apache.tools.ant.types.PropertySet
 assertions=org.apache.tools.ant.types.Assertions
 concatfilter=org.apache.tools.ant.filters.ConcatFilter
+org.apache.tools.ant.taskdefs.optional.condition.IsPingable
\ No newline at end of file