diff --git a/app/plugins/EnvSource/src/Model/Table/EnvSourcesTable.php b/app/plugins/EnvSource/src/Model/Table/EnvSourcesTable.php
index 398a231eb..f03e3856d 100644
--- a/app/plugins/EnvSource/src/Model/Table/EnvSourcesTable.php
+++ b/app/plugins/EnvSource/src/Model/Table/EnvSourcesTable.php
@@ -335,8 +335,8 @@ protected function resultToEntityData(
       'env_identifier_epuid' => 'epuid',
       'env_identifier_network' => 'network',
       'env_identifier_oidcsub' => 'oidcsub',
-      'env_identifier_samlpairwiseid' => 'samlpairwiseid',
-      'env_identifier_samlsubjectid' => 'samlsubjectid'
+      'env_identifier_samlpairwiseid' => 'pairwiseid',
+      'env_identifier_samlsubjectid' => 'subjectid'
       // We don't include source_key (sorid) because the Pipeline will automatically insert it
     ] as $v => $t) {
       // Because we're in an External Identity context, we don't need to map the
diff --git a/app/src/Lib/Traits/EnrollmentControllerTrait.php b/app/src/Lib/Traits/EnrollmentControllerTrait.php
index 171c4a4fa..6834cbb0e 100644
--- a/app/src/Lib/Traits/EnrollmentControllerTrait.php
+++ b/app/src/Lib/Traits/EnrollmentControllerTrait.php
@@ -393,7 +393,7 @@ protected function transitionToStep(int $petitionId, bool $start=false) {
 
       if(empty($stepInfo['step']->message_template_id)) {
         // Throw a more helpful error than "Record not found"
-        throw new \RuntimeException(__d('error', 'EnrollmentFlowSteps.message_template', [ $stepInfo['step']->id ]));
+        throw new \RuntimeException(__d('error', 'EnrollmentFlowSteps.message_template', [ $stepInfo['step']->id ?? $stepInfo['lastStep']->id ]));
       }
 
       $template = $MessageTemplates->get($stepInfo['step']->message_template_id);
diff --git a/app/src/Model/Table/PipelinesTable.php b/app/src/Model/Table/PipelinesTable.php
index ab24740fc..fd313da92 100644
--- a/app/src/Model/Table/PipelinesTable.php
+++ b/app/src/Model/Table/PipelinesTable.php
@@ -959,7 +959,7 @@ protected function mapAttributesToCO(
           }
           catch(\Exception $e) {
             // If we can't find a type we can't insert this record
-            $this->llog('error', "Failed to map $attr type \"" . $attr['type'] . "\" to a valid Type ID for EIS record " . $eisAttributes['source_key'] . ", skipping");
+            $this->llog('error', "Failed to map attribute type \"" . $attr['type'] . "\" to a valid Type ID for EIS record " . $eisAttributes['source_key'] . ", skipping");
           }
         }
       }