Fixed parse the else part of the if
Fixed display of the variable name instead of the function name, when the return of the function is used and the function is not defined in the code