As William says, use get_upload_location everywhere!