diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
index 985ef512d..4df1cdc43 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Condition.java
@@ -42,7 +42,7 @@ public class Condition
     }
 
     public boolean evaluate( final Context context )
-        throws TaskException
+        throws ContextException
     {
         boolean result = false;
 
@@ -66,7 +66,7 @@ public class Condition
         }
         catch( final PropertyException pe )
         {
-            throw new TaskException( "Error resolving " + m_condition, pe );
+            throw new ContextException( "Error resolving " + m_condition, pe );
         }
 
         if( !m_isIfCondition )