Fixed 500 in data point handler