Added error handling content