DB fix and fix pokemon error catching