fix: enhance call to throw logic and handle return statements

fix: enhance call to throw logic and handle return statements #356