Try and handle "death on startup" a bit cleaner