CDB-2131 better logging