diff --git a/project.xml b/project.xml
index 4c43321..2d4406d 100644
--- a/project.xml
+++ b/project.xml
@@ -82,9 +82,8 @@
      </aspectSourceDirectories>
 
      <unitTestClassEntries>
-       <unitTestClassEntry>
-         exclude = **/*.class
-       </unitTestClassEntry>
+       <unitTestClassEntry>include = **/*Test*.class</unitTestClassEntry>
+       <unitTestClassEntry>exclude = **/*$*.class</unitTestClassEntry>
      </unitTestClassEntries>
 
      <runtimeTestClassEntries>
diff --git a/src/java/org/apache/commons/graph/impl/DirectedGraphImpl.java b/src/java/org/apache/commons/graph/impl/DirectedGraphImpl.java
index df9ee46..513add0 100644
--- a/src/java/org/apache/commons/graph/impl/DirectedGraphImpl.java
+++ b/src/java/org/apache/commons/graph/impl/DirectedGraphImpl.java
@@ -452,16 +452,13 @@ public class DirectedGraphImpl
                          Object args[])
         throws Throwable
     {
-        try
+        try 
         {
             return method.invoke(this, args);
-        }
-        catch (InvocationTargetException ex)
+        } 
+        catch (InvocationTargetException ex) 
         {
-            //!! David can fix this, this needs to run on 1.3
-            return null;
-            //throw ex.getCause();
+            throw ex.getTargetException();
         }
     }
-
 }