Measurement quality and error handling

Measurement quality and error handling