Bugfix: old name in exception handling clause.
Better handling of exceptions raised during evaluating expansions.