fixing null uploads case