Better logging to help debug issue #4