Improved logging ... to try and track down a problem.