adding the short-circuit in that block should be enough:

https://github.com/yahoo/locator-lang/pull/6/files#diff-f85c36a1cc8952fb5e6fc7200a89ceaaR191