Eluna fix crash on shutdown, closes #71