Remove skip_undefined, add logging