Attempt to fix issues with new LMS death code.