Improving error handline and Location tests
mergin	:w

Merge branch 'master' of https://github.com/DerekSansom/shine