Fix #1040: panic on start up

Can we just nuke it?