Improve output a bit and raise exception correctly
Merge branch 'master' of https://github.com/simpleenergy/Site-Shrinker