Add some better logging to try and pin down #2.