Improve measure update errors

Fixes #2595