Added error handling / some feedback

Added some feedback to let the user know what's going on, added error
handling