diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py b/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
index d12766c78d1f948a16146dc2292537f0d7a64d5f..0a4fb1ca968c4d2c5ebb0727c6fb2e34d442a065 100755
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/lib/assignment.py
@@ -202,6 +202,10 @@ class ResourceAssigner():
                 self._sendNotification(task, 'scheduled')
 
             self.processPredecessors(specification_tree)
+        else:
+            logger.warning('doAssignment: Not all claims could be inserted. Setting task %s status to conflict' % (taskId))
+            self.radbrpc.updateTask(taskId, status='conflict')
+            self._sendNotification(task, 'conflict')
 
     def _sendNotification(self, task, status):
         try: