diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java
index 1fafabe33..17ceffa2f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java
@@ -20,17 +20,19 @@
 
 package org.navalplanner.web.reports;
 
-import java.util.ArrayList;
+import static org.navalplanner.web.I18nHelper._;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import net.sf.jasperreports.engine.JRDataSource;
 
 import org.navalplanner.business.orders.entities.Order;
+import org.navalplanner.web.common.components.ExtendedJasperreport;
 import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zul.Datebox;
 import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Listitem;
@@ -91,4 +93,12 @@ public class WorkingProgressPerTaskController extends NavalplannerReportControll
         return result;
     }
 
+    public void showReport(ExtendedJasperreport jasperreport) {
+        final Order order = getSelectedOrder();
+        if (order == null) {
+            throw new WrongValueException(lbOrders, _("Please, select an order"));
+        }
+        super.showReport(jasperreport);
+    }
+
 }