diff --git a/macros/incremental_hooks/get_enabled_snowplow_models.sql b/macros/incremental_hooks/get_enabled_snowplow_models.sql
index d2054ae7..13c05a92 100644
--- a/macros/incremental_hooks/get_enabled_snowplow_models.sql
+++ b/macros/incremental_hooks/get_enabled_snowplow_models.sql
@@ -17,7 +17,8 @@
   {% set enabled_models = [] %}
   {% set untagged_snowplow_models = [] %}
   {% set snowplow_model_tag = package_name+'_incremental' %}
-  {% set snowplow_events_this_run_path = 'model.'+package_name+'.'+base_events_table_name %}
+  {% set snowplow_events_this_run_path = 'model.'+project_name+'.'+package_name+'_base_events_this_run' %}
+
   {% if execute %}
 
     {% set nodes = graph.nodes.values() | selectattr("resource_type", "equalto", "model") %}
@@ -53,6 +54,10 @@
 
     {% endif %}
 
+    {% if enabled_models|length == 0 %}
+      {%- do exceptions.raise_compiler_error("No enabled models identified.") -%}
+    {% endif %}
+
   {% endif %}
 
   {{ return(enabled_models) }}