[AESH-188]
make sure all variables are caught