i think it's better to remove the 'as e' here, and just 'raise' below (line 438)