Fix NPE in DEF Rollback