catch returns outside of routines better
catch returns outside of routines better

Already did this at compile time, but we can do a good job for
the things that slip through at runtime as well.

Addresses #63.

masak/007,masak/007,masak/007