Fixed placement of return call to work after syntax errors