Added null checking on transaction matching
WIP backing up