CHOOSE support and better error reporting.