diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java
index ad67fa3f9..8c3a1babc 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java
@@ -70,7 +70,8 @@ public class SubcontractController extends GenericForwardComposer {
 
     public void accept() throws ValidationException {
         int status = Messagebox.YES;
-        if (subcontractModel.hasResourceAllocations()) {
+        if (subcontractModel.hasResourceAllocations()
+                && (subcontractModel.getSubcontractedTaskData() != null)) {
             try {
                 status = Messagebox
                         .show(