Add extra null check and add 3 status for downloaded

Test: manual
Change-Id: Idd07b9a18ec0b22cf725d53b925a237b4242d0f3
2 files changed