diff --git a/MAPL_Base/MAPL_TilingRegridder.F90 b/MAPL_Base/MAPL_TilingRegridder.F90
index bbd1f9e26f4b..9123c681f0c9 100644
--- a/MAPL_Base/MAPL_TilingRegridder.F90
+++ b/MAPL_Base/MAPL_TilingRegridder.F90
@@ -427,6 +427,7 @@ subroutine find_tile_file(this, file_name, swap, unusable, rc)
          
       ! Next we search for a tempest ".nc4" file
       trial_name = make_tile_file_name(grid_name_in, grid_name_out,'.nc4')
+      inquire(file=trial_name, exist=exists)
       if (exists) then
          swap = .false.
       else ! swap
@@ -440,9 +441,10 @@ subroutine find_tile_file(this, file_name, swap, unusable, rc)
       if (exists) then
          file_name = trial_name
          this%file_type = TEMPEST
+         _RETURN(_SUCCESS)
       end if
 
-      _RETURN(_SUCCESS)
+      _RETURN(_FAILURE)
 
 
    contains