Report correct location if local.hex failed

Fixes #2765.
Since we are changing the return value, I agree with you, this is better as a new function. :S