[Untested]Should fix the destroying angel runtime errors.

Should fix #875. I don't have time to test it yet, will do later.