diff --git a/internal/tests/pytests/wrappers/tc_pairs/test_tc_pairs_wrapper.py b/internal/tests/pytests/wrappers/tc_pairs/test_tc_pairs_wrapper.py
index ee30563029..0edb935b29 100644
--- a/internal/tests/pytests/wrappers/tc_pairs/test_tc_pairs_wrapper.py
+++ b/internal/tests/pytests/wrappers/tc_pairs/test_tc_pairs_wrapper.py
@@ -223,6 +223,26 @@ def test_get_basin_cyclone_from_bdeck(metplus_config, template, filename,
         assert actual_cyclone == expected_cyclone
 
 
+@pytest.mark.wrapper
+def test_get_basin_cyclone_from_bdeck_error(metplus_config):
+    full_filename = os.path.join('/fake/dir', '20141009bal.dat')
+    config = metplus_config
+    set_minimum_config_settings(config)
+    wrapper = TCPairsWrapper(config)
+    wrapper.c_dict['BDECK_DIR'] = '/fake/dir'
+    wrapper.c_dict['BDECK_TEMPLATE'] = '{date?fmt=%Y}{cyclone?fmt=%s}b{basin?fmt=%s}.dat'
+    with mock.patch.object(tcp, 'get_tags', return_value = 50 * [0]):
+        actual = wrapper._get_basin_cyclone_from_bdeck(full_filename,
+                                          True,
+                                          'al',
+                                          '1009',
+                                          {'date': datetime(2014, 12, 31, 18)},
+                                          )
+    assert actual == (None, None)
+    last_err = wrapper.logger.error.call_args_list[0][0][0]
+    assert "Number of regex match groups does not match" in last_err
+
+
 @pytest.mark.parametrize(
     'config_overrides, storm_type, values_to_check, reformat', [
         # 0: storm_id
@@ -277,7 +297,7 @@ def test_tc_pairs_storm_id_lists(metplus_config, config_overrides,
     if reformat:
         config.set('config', 'TC_PAIRS_REFORMAT_DECK', True)
         config.set('config', 'TC_PAIRS_REFORMAT_DECK_TYPE', 'SBU')
-        config.set('config', 'TC_PAIRS_REFORMAT_DIR', '{OUTPUT_DIR}')
+        config.set('config', 'TC_PAIRS_REFORMAT_DIR', '{OUTPUT_BASE}')
         
     wrapper = TCPairsWrapper(config)
     assert wrapper.isOK
@@ -839,3 +859,58 @@ def test_bad_add_config(metplus_config):
         wrapper._handle_diag_convert_map()
         assert not wrapper.isOK
 
+
+# Test data for test_read_modify_write_file
+csv_in1 = '''STM, 0006, del this, -9.1, 100, 143.3, -37.987
+STM, 0005, del this, -9, 100, 145.0, foo\r\n'''
+csv_out1 = '''STM, 050006, -9.1, 100, 143.3, -37.987
+STM, 050005, -9999, 100, 145.0, foo\n'''
+
+csv_in2 = '''STM, 0006, -9, -9.1
+STM, 0005, ??, -9
+STM1, -9, -9999, -9\n'''
+csv_out2 = '''STM, 050006, -9.1
+STM, 050005, -9999
+STM1, 05-9, -9999\n'''
+
+csv_in3 = '''STM, 0006, -9, -9.1
+STM2, 0005, -9, -9
+STM1, -9, -9999, -9\r'''
+csv_out3 = '''STM, 050006, -9.1
+STM, 050005, -9999
+STM1, 05-9, -9999\n'''
+
+@pytest.mark.parametrize(
+    'replace_tuple, content, expected',
+       [
+         # 1: Basic test
+         (('d','x'),'a, b, c, d\r\n', 'a, 05b, x\n'),
+         # 2: Multi row
+         (('-9','-9999'), csv_in1, csv_out1 ),
+         # 3: Multi row with multi replacement
+         (('-9','-9999'),csv_in2, csv_out2),
+         # 4: Repeated values and \r
+         (('-9','-9999'),csv_in2, csv_out2),
+         #5: empty file
+         (('foo', 'bar'),'',''),
+       ]
+)
+def test_read_modify_write_file(tmp_path_factory,
+                                metplus_config,
+                                replace_tuple,
+                                content,
+                                expected):
+    config = metplus_config
+    wrapper = TCPairsWrapper(config)
+    tmp_file = os.path.join(tmp_path_factory.mktemp('tc_pairs'), 'tc_test.csv')
+    out_file = os.path.join(tmp_path_factory.mktemp('tc_pairs'), 'tc_out.csv')
+
+    with open(tmp_file, 'w') as f:
+        f.write(content)
+
+    wrapper.read_modify_write_file(tmp_file,'05', replace_tuple,out_file)
+
+    with open(out_file, 'r') as f:
+        actual = f.read()
+    assert actual == expected
+
diff --git a/metplus/wrappers/tc_pairs_wrapper.py b/metplus/wrappers/tc_pairs_wrapper.py
index 77e702cd98..c7b5a7cf9c 100755
--- a/metplus/wrappers/tc_pairs_wrapper.py
+++ b/metplus/wrappers/tc_pairs_wrapper.py
@@ -895,9 +895,9 @@ def read_modify_write_file(in_csvfile, storm_month, missing_values,
                 row[1] = " " + storm_month + (row[1]).strip()
 
                 # Iterate over the items, deleting or modifying the columns
-                for item in row:
+                for index, item in enumerate(row):
                     # Delete the third column
-                    if item == row[2]:
+                    if index == 2:
                         continue
                     # Replace MISSING_VAL_TO_REPLACE=missing_values[0] with
                     # MISSING_VAL=missing_values[1]