Revert "some of the throws"

This reverts commit f992a64762fa09c3472ce00af0e833c7a144066f.