diff --git a/docs/manual/CoreTasks/subant.html b/docs/manual/CoreTasks/subant.html
index 68aa8861a..36c00ba63 100644
--- a/docs/manual/CoreTasks/subant.html
+++ b/docs/manual/CoreTasks/subant.html
@@ -50,7 +50,7 @@
         of ant for bulk project execution.
 
         <strong>This task must no be used outside of a
-        <code>target</code> if it invoces the same build file it is
+        <code>target</code> if it invokes the same build file it is
         part of.</strong>
 
         </p>
diff --git a/docs/manual/CoreTasks/xmlproperty.html b/docs/manual/CoreTasks/xmlproperty.html
index 3c337d34b..821f42edf 100644
--- a/docs/manual/CoreTasks/xmlproperty.html
+++ b/docs/manual/CoreTasks/xmlproperty.html
@@ -8,7 +8,7 @@
 <h2><a name="xmlproperty">XmlProperty</a></h2>
 <h3>Description</h3>
 <p>
-Loads property values from a valid xml file.  This XML property file:
+Loads property values from a well-formed xml file.  This XML property file:
 <pre>
   &lt;root&gt;
     &lt;properties&gt;
@@ -16,7 +16,7 @@ Loads property values from a valid xml file.  This XML property file:
     &lt;/properties&gt;
   &lt;/root&gt;
 </pre>
-is roughly equivalent to this java property file:
+is roughly equivalent to this Java property file:
 <pre>
   root.properties.foo = bar
 </pre>
@@ -25,7 +25,7 @@ is roughly equivalent to this java property file:
 By default, this load
 does <em>no</em> processing of the input.  In particular, unlike the
 <a href="property.html">Property task</a>, property references
-(i.e., ${foo}) are not resolved.
+(i.e., <samp>${foo}</samp>) are not resolved.
 <p>
 <a name="semanticAttributes">
 <h3>Semantic Attributes</h3>
@@ -98,7 +98,7 @@ is roughly equivalent to the following fragments in a build.xml file:
   </tr>  
   <tr>
     <td valign="top">validate</td>
-    <td valign="top">Validate the input file.</td>
+    <td valign="top">Validate the input file (e.g. by a DTD). Otherwise the XML must only be well-formed.</td>
     <td valign="top" align="center">No, default is <i>false</i>.</td>
   </tr>
   <tr>
@@ -250,11 +250,10 @@ is equivalent to the following entries in a build file:
   &lt;/classpath&gt;
 </pre>
 
-<hr/>
+<hr>
 
-<p align="center">Copyright &copy; 2002 Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2002-2003 Apache Software Foundation. All rights
 Reserved.</p>
 
 </body>
 </html>
-
diff --git a/docs/manual/CoreTypes/zipfileset.html b/docs/manual/CoreTypes/zipfileset.html
index ddc76189f..1a9eeb053 100644
--- a/docs/manual/CoreTypes/zipfileset.html
+++ b/docs/manual/CoreTypes/zipfileset.html
@@ -21,7 +21,7 @@ is used, the zipfileset is populated with filesystem files found under <span
   </li>
 </ul>
 <p><code>&lt;zipfileset&gt;</code> supports all attributes of <code>&lt;<a
- href="file:///C:/dev/gnu/ant/docs/manual/CoreTypes/fileset.html">fileset</a>&gt;</code>
+ href="fileset.html">fileset</a>&gt;</code>
 in addition to those listed below.<br>
 </p>
 <p>Since Ant 1.6, a zipfileset can be defined with the <span
diff --git a/docs/manual/tasksoverview.html b/docs/manual/tasksoverview.html
index 30667aa28..109e0bc9c 100644
--- a/docs/manual/tasksoverview.html
+++ b/docs/manual/tasksoverview.html
@@ -1048,7 +1048,7 @@ documentation.</p>
 
   <tr valign="top">
     <td nowrap><a href="CoreTasks/xmlproperty.html">XmlProperty</a></td>
-    <td><p>Loads property values from a valid XML file.</p></td>
+    <td><p>Loads property values from a well-formed XML file.</p></td>
   </tr>
 </table>
 
diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java
index dd83d1ba0..6c04d269e 100644
--- a/src/main/org/apache/tools/ant/AntClassLoader.java
+++ b/src/main/org/apache/tools/ant/AntClassLoader.java
@@ -80,7 +80,7 @@ import org.apache.tools.ant.util.LoaderUtils;
  * class will then use this loader rather than the system class loader.
  *
  * @author Conor MacNeill
- * @author <a href="mailto:Jesse.Glick@netbeans.com">Jesse Glick</a>
+ * @author <a href="mailto:jglick@netbeans.org">Jesse Glick</a>
  * @author Magesh Umasankar
  */
 public class AntClassLoader extends ClassLoader implements BuildListener {
diff --git a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
index 0ffcb8268..fca576fa9 100644
--- a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
+++ b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
@@ -64,6 +64,7 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.XMLCatalog;
 import org.apache.tools.ant.types.ResourceLocation;
 
+import org.apache.xml.resolver.Catalog;
 import org.apache.xml.resolver.CatalogManager;
 
 import org.apache.xml.resolver.tools.CatalogResolver;
@@ -124,7 +125,7 @@ public class ApacheCatalogResolver extends CatalogResolver {
         CatalogManager.getStaticManager().setUseStaticCatalog(false);
 
         // debug
-        // System.setProperty("xml.catalog.verbosity", "4");
+        // CatalogManager.getStaticManager().setVerbosity(4);
     }
 
     /** Set the XMLCatalog object to callback. */
@@ -138,7 +139,11 @@ public class ApacheCatalogResolver extends CatalogResolver {
      */
     public void parseCatalog(String file) {
 
-        ApacheCatalog catalog = (ApacheCatalog) getCatalog();
+        Catalog _catalog = getCatalog();
+        if (!(_catalog instanceof ApacheCatalog)) {
+            throw new BuildException("Wrong catalog type found: " + _catalog.getClass().getName());
+        }
+        ApacheCatalog catalog = (ApacheCatalog) _catalog;
 
         // Pass in reference to ourselves so we can be called back.
         catalog.setResolver(this);