Enhanced error handling and added some new output #3