Merge "Added error message to error state." into main