WL-2962

Not really a fix, but might help in working out where things are going wrong.