Issue #2722271 by mr.baileys: Make sure as little code as possible is triggered when throwing an exception