Change task isFinished to isStopped and include KILLED and FAILED as other possible stops besides FINISHED