diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly
index 5c7b28ab..5ecfc82e 100644
--- a/multiproject/plugin.jelly
+++ b/multiproject/plugin.jelly
@@ -2,6 +2,7 @@
 
 <project 
   xmlns:j="jelly:core"
+  xmlns:m="maven"
   xmlns:maven="jelly:maven"
   xmlns:ant="jelly:ant"
   xmlns:doc="doc"
@@ -104,12 +105,10 @@
   <!-- Run specific sets of goals for all subprojects                   -->
   <!--==================================================================-->
   <goal name="multiproject:goal" description="Run a given goal on all projects">
-      <!-- FIXME: This should be a tag somewhere else as it's common to do tag param checking -->
-      <j:if test="${empty(goal)}">
-          <ant:fail>A goal to run must be specified, e.g.
-maven -Dgoal=clean multiproject:goal
-          </ant:fail>
-      </j:if>
+      <m:param-check value="${goal}" fail="true">
+A goal to run must be specified, e.g.
+maven -Dgoal=clean multiproject:goal" fail="true"</m:param-check>
+
       <ant:echo>Executing ${goal} on all projects</ant:echo>
       <maven:reactor
         basedir="${maven.multiproject.basedir}"