BUG-362: add some diagnostic information