One last fix for downloads to prevent NPE