And don't exclude non-existent tasks.

Change-Id: I6403ff3ab6c96a10c380646152571603ae3b83fb