Hotfix: Made sure task id always exists