Fix entity controller not removing properly on spawn fail