Bail on bad expressions
Fix crashes in expressions that become broken
Use new style exception matching