Remove the need for throw