diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
index f20c3a41f..9652f80c9 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
@@ -484,7 +484,10 @@ public abstract class TaskElement extends BaseEntity {
     private void detachIncomingDependencies() {
         Set<TaskElement> tasksToNotify = new HashSet<TaskElement>();
         for (Dependency dependency : dependenciesWithThisDestination) {
-            tasksToNotify.add(dependency.getOrigin());
+            TaskElement origin = dependency.getOrigin();
+            if (origin != null) {
+                tasksToNotify.add(origin);
+            }
         }
         for (TaskElement taskElement : tasksToNotify) {
             taskElement.removeDependenciesWithDestination(this);
@@ -494,7 +497,10 @@ public abstract class TaskElement extends BaseEntity {
     private void detachOutcomingDependencies() {
         Set<TaskElement> tasksToNotify = new HashSet<TaskElement>();
         for (Dependency dependency : dependenciesWithThisOrigin) {
-            tasksToNotify.add(dependency.getDestination());
+            TaskElement destination = dependency.getDestination();
+            if (destination != null) {
+                tasksToNotify.add(destination);
+            }
         }
         for (TaskElement taskElement : tasksToNotify) {
             taskElement.removeDependenciesWithOrigin(this);