Improved error reporting/checking in install scripts
Merge branch 'fix-installer'