Update to using safeDelete, should fix crashes.