Install: Put in initial protection against an install going wrong.
Mass install: Added more protection for the install
Merge branch 'kevdev'