Moved extId constraint check to evaluateLocation-function