Fix throwables

Resf #1398