diff --git a/lcviz/plugins/ephemeris/ephemeris.py b/lcviz/plugins/ephemeris/ephemeris.py
index 6912ef4..d318fb8 100644
--- a/lcviz/plugins/ephemeris/ephemeris.py
+++ b/lcviz/plugins/ephemeris/ephemeris.py
@@ -158,7 +158,7 @@ def user_api(self):
             'times_to_phases', 'phases_to_times', 'get_data',
             'dataset', 'method', 'period_at_max_power',
             'adopt_period_at_max_power', 'query_for_ephemeris',
-            'query_result', 'adopt_from_catalog', 'adopt_from_catalog_in_new_viewer'
+            'query_result', 'adopt_from_catalog', 'create_ephemeris_from_query'
         ]
         return PluginUserApi(self, expose=expose)
 
@@ -680,36 +680,38 @@ def _select_query_result(self, *args):
     def vue_query_for_ephemeris(self, *args):
         self.query_for_ephemeris()
 
-    def adopt_from_catalog(self, *args):
-        if len(self._get_phase_viewers()):
-            # if a phase viewer is available, adopt the ephemeris in the phase viewer:
-            if not np.any(np.isnan([self.period_from_catalog, self.t0_from_catalog])):
-                self.period = self.period_from_catalog
-                self.t0 = self.t0_from_catalog
-
-                # reset the phase axis wrap to feature the primary transit:
-                self.wrap_at = 0.5
-                viewer = self._get_phase_viewers()[0]
-                viewer.reset_limits()
-        else:
-            # otherwise, adopt the ephemeris in a new phase viewer:
-            self.adopt_from_catalog_in_new_viewer()
-
-    def adopt_from_catalog_in_new_viewer(self, *args):
+    def create_ephemeris_from_query(self, *args):
         new_component_label = self.query_result_selected.replace(' ', '')
         if new_component_label in self.component.choices:
             # warn the user that an ephemeris component already exists with this label,
             # a second won't be added:
             self.hub.broadcast(
                 SnackbarMessage(
-                    f"Ephemeris component {new_component_label} already exists, skipping.",
+                    f"Ephemeris component {new_component_label} already exists, "
+                    f"this ephemeris component will not be added.",
                     sender=self, color="warning"
                 )
             )
-        else:
+        elif not np.any(np.isnan([self.period_from_catalog, self.t0_from_catalog])):
             self.add_component(new_component_label)
             self.create_phase_viewer()
-            self.adopt_from_catalog()
 
-    def vue_adopt_from_catalog_in_new_viewer(self, *args):
-        self.adopt_from_catalog_in_new_viewer()
+            self.period = self.period_from_catalog
+            self.t0 = self.t0_from_catalog
+
+            # reset the phase axis wrap to feature the primary transit:
+            self.wrap_at = 0.5
+            viewer = self._get_phase_viewers()[0]
+            viewer.reset_limits()
+        else:
+            self.hub.broadcast(
+                SnackbarMessage(
+                    f"Catalog period ({self.period_from_catalog}) or "
+                    f"epoch ({self.t0_from_catalog}) is NaN, this ephemeris "
+                    f"component will not be added.",
+                    sender=self, color="warning"
+                )
+            )
+
+    def vue_create_ephemeris_from_query(self, *args):
+        self.create_ephemeris_from_query()
diff --git a/lcviz/plugins/ephemeris/ephemeris.vue b/lcviz/plugins/ephemeris/ephemeris.vue
index a55bc45..6f29266 100644
--- a/lcviz/plugins/ephemeris/ephemeris.vue
+++ b/lcviz/plugins/ephemeris/ephemeris.vue
@@ -245,7 +245,7 @@
             <v-row justify="end">
             <v-col>
               <plugin-action-button
-                @click="adopt_from_catalog_in_new_viewer"
+                @click="create_ephemeris_from_query"
                 :disabled="component_items.map(item => item.label).includes(query_result_selected.replace(/\s/g, ''))">
                   Create new component
               </plugin-action-button>
diff --git a/lcviz/tests/test_plugin_ephemeris.py b/lcviz/tests/test_plugin_ephemeris.py
index d268e46..bd6157c 100644
--- a/lcviz/tests/test_plugin_ephemeris.py
+++ b/lcviz/tests/test_plugin_ephemeris.py
@@ -150,12 +150,11 @@ def test_ephemeris_queries(helper, light_curve_like_kepler_quarter):
     ephem = helper.plugins['Ephemeris']
 
     ephem.query_for_ephemeris()
-    # this should be HAT-P-11 b:
     planet = ephem.query_result.choices[0]
     assert planet == 'HAT-P-11 b'
 
     ephem.query_result = planet
-    ephem.adopt_from_catalog()
+    ephem.create_ephemeris_from_query()
 
     compare_against_literature_ephemeris(helper, ephem)
 
@@ -168,11 +167,10 @@ def test_ephemeris_query_no_name(helper, light_curve_like_kepler_quarter):
     ephem = helper.plugins['Ephemeris']
 
     ephem.query_for_ephemeris()
-    # this should be HAT-P-11 b:
     planet = ephem.query_result.choices[0]
     assert planet == 'HAT-P-11 b'
 
     ephem.query_result = planet
-    ephem.adopt_from_catalog()
+    ephem.create_ephemeris_from_query()
 
     compare_against_literature_ephemeris(helper, ephem)