Just in case update (for unhandled exceptions happening too soon)