Updated with missing throwables