Improved panic recovery.