Added check for no upload