diff --git a/src/PowerModels/core/objective.jl b/src/PowerModels/core/objective.jl
index 3a09b20..6304f68 100644
--- a/src/PowerModels/core/objective.jl
+++ b/src/PowerModels/core/objective.jl
@@ -157,7 +157,7 @@ function expression_pg_cost(pm::AbstractPowerModel; report::Bool = true)
                 )
             else
                 error(
-                    "Only cost models of types 1 and 2 are supported at this time, given cost model type of $(model) on generator $(i)",
+                    "Only cost models of types 1 and 2 are supported at this time, given cost model type of $(gen["model"]) on generator $(i)",
                 )
             end
         end
diff --git a/src/operation/decision_model.jl b/src/operation/decision_model.jl
index b6ce1b9..5dce302 100644
--- a/src/operation/decision_model.jl
+++ b/src/operation/decision_model.jl
@@ -67,7 +67,7 @@ function build!(
     IOM.register_recorders!(model, file_mode)
     logger = IS.configure_logging(get_internal(model), IOM.PROBLEM_LOG_FILENAME, file_mode)
     if store_system_in_results
-        @warn "store_system_in_results for $(model) is set to true. This will do nothing unless a Simulation is being built."
+        @warn "store_system_in_results is set to true. This will do nothing unless a Simulation is being built."
     end
     try
         Logging.with_logger(logger) do
@@ -151,7 +151,7 @@ function solve!(
     kwargs...,
 )
     if store_system_in_results
-        @warn "store_system_in_results for $(model) is set to true. This will do nothing unless a Simulation is being built."
+        @warn "store_system_in_results is set to true. This will do nothing unless a Simulation is being built."
     end
     build_if_not_already_built!(
         model;
diff --git a/src/operation/emulation_model.jl b/src/operation/emulation_model.jl
index 9241729..6cf711d 100644
--- a/src/operation/emulation_model.jl
+++ b/src/operation/emulation_model.jl
@@ -69,7 +69,7 @@ function build!(
         file_mode,
     )
     if store_system_in_results
-        @warn "store_system_in_results for $(model) is set to true. This will do nothing unless a Simulation is being built."
+        @warn "store_system_in_results is set to true. This will do nothing unless a Simulation is being built."
     end
     try
         Logging.with_logger(logger) do
@@ -197,7 +197,7 @@ function run!(
     kwargs...,
 )
     if store_system_in_results
-        @warn "store_system_in_results for $(model) is set to true. This will do nothing unless a Simulation is being built."
+        @warn "store_system_in_results is set to true. This will do nothing unless a Simulation is being built."
     end
     build_if_not_already_built!(
         model;