fixes to currswitchablepokemon oob exception