Bug 1077136 - better logging