Salmon 13 14 acu127822 fix no op rescue

Not sure if this is a good idea yet. The original code seems like a very bad idea, though.