Fix: NPE when moving non-saved-survival-state