Added support for short variable name exceptions