Added error handling of manual point data