Bug fixes for installation script error scenarios (incomplete!)