improved diagnostics for driver
further improved diagnostics