Merge "Fix NPE when combining pop with add transaction."