Fix regression: insertion of call top perror caused return to become unconditional. Add braces so it is again conditional.