Small changes for possible throw function