Improved error handling and updated install package