Fixes #5558: allow to use $ { } in variables and correct class condition...

... and reporting
good catch, correcting it