Add error message prints and usability enhancements