Try to recreate task when it returns nil
Merge branch 'fix-nil-task' into together-1.6