diff --git a/src/DataWrangling/ECCO/ECCO.jl b/src/DataWrangling/ECCO/ECCO.jl
index 576e81014..f41d811bc 100644
--- a/src/DataWrangling/ECCO/ECCO.jl
+++ b/src/DataWrangling/ECCO/ECCO.jl
@@ -284,7 +284,7 @@ end
 dataset_variable_name(data::Metadata{<:ECCO2Daily})   = ECCO2_dataset_variable_names[data.name]
 dataset_variable_name(data::Metadata{<:ECCO2Monthly}) = ECCO2_dataset_variable_names[data.name]
 dataset_variable_name(data::Metadata{<:ECCO4Monthly}) = ECCO4_dataset_variable_names[data.name]
-dataset_location(::ECCODataset, name) = ECCO_location[name]
+dataset_location(::ECCODataset, name) = name in keys(ECCO_location) ? ECCO_location[name] : (Center, Center, Center)
 
 is_three_dimensional(data::ECCOMetadata) =
     data.name == :temperature ||
diff --git a/src/DataWrangling/restoring.jl b/src/DataWrangling/restoring.jl
index 69e3cf18f..ceb8be818 100644
--- a/src/DataWrangling/restoring.jl
+++ b/src/DataWrangling/restoring.jl
@@ -197,7 +197,8 @@ function DatasetRestoring(metadata::Metadata,
                           time_indices_in_memory = default_time_indices_in_memory(metadata),
                           time_indexing = Cyclical(),
                           inpainting = NearestNeighborInpainting(Inf),
-                          cache_inpainted_data = true)
+                          cache_inpainted_data = true,
+						  field_name = oceananigans_fieldnames[metadata.name])
 
     download_dataset(metadata)
 
@@ -210,10 +211,6 @@ function DatasetRestoring(metadata::Metadata,
     arch = architecture(fts)
     mask = on_architecture(arch, mask)
 
-    # Grab the correct Oceananigans field to restore
-    variable_name = metadata.name
-    field_name = oceananigans_fieldnames[variable_name]
-
     # If we pass the grid we do not need to interpolate
     # so we can save parameter space by setting the native grid to nothing
     on_native_grid = arch_or_grid isa AbstractArchitecture