Instrumentation
Improved error messages