revert the throw thing

we keep refactoring changes only