case 2123 - better handling of undefined vars.