[CDB-1506] Added more protection for dump method