Improve the sad path.