Reduce warnning
Add variable is_block_call for avoid repeating compare
Delte duplicated exit check