#946 Added error handling and messaging
#946 Added error handling and messaging