Improved error handling for Ex 1.16 + Ex 1.17