Added support for variables
correct exception