Added error handling messages