fix: enhance call to throw logic and handle return statements (#140)

fix: enhance call to throw logic and handle return statements (#140) #99