Add check to make sure uploader exists