Improve error messages for Engine