revert pokemon exception handling for handle_* in import stage