Adjust throwing code