Two more checks for no upload