Add some check on tasks