diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25bd7b2..7af345d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+## [3.20.1] 2024-12-10
+
+- Avoided accessing non-initialized property when logging in `os2forms_nemid`.
+
 ## [3.20.0] 2024-12-09
 
 - Added webform ID to digital post audit logging messages.
@@ -314,7 +318,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - Security in case of vulnerabilities.
 ```
 
-[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.20.0...HEAD
+[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.20.1...HEAD
+[3.20.1]: https://github.com/OS2Forms/os2forms/compare/3.20.0...3.20.1
 [3.20.0]: https://github.com/OS2Forms/os2forms/compare/3.19.0...3.20.0
 [3.19.0]: https://github.com/OS2Forms/os2forms/compare/3.18.0...3.19.0
 [3.18.0]: https://github.com/OS2Forms/os2forms/compare/3.17.0...3.18.0
diff --git a/modules/os2forms_nemid/src/Service/FormsHelper.php b/modules/os2forms_nemid/src/Service/FormsHelper.php
index d6788e8..7ac569e 100644
--- a/modules/os2forms_nemid/src/Service/FormsHelper.php
+++ b/modules/os2forms_nemid/src/Service/FormsHelper.php
@@ -147,9 +147,15 @@ public function retrieveCprLookupResult(FormStateInterface $form_state) {
     $authProviderPlugin = $this->getAuthProvider($form_state);
 
     $userCpr = $authProviderPlugin->fetchValue('cpr');
-    $lookedUpCpr = $cprLookupResult->getCpr();
-
-    $this->auditLogger->info('DataLookup', 'User with cpr ' . $userCpr . ' looked up cpr ' . $lookedUpCpr);
+    $lookedUpCpr = $cprLookupResult->getFieldValue('cpr');
+
+    // Current method is called whenever the webform is rendered.
+    // As a result, it is also called in situations where both
+    // userCpr and lookedUpCpr does not make sense, e.g.
+    // adding an element to a webform.
+    if ($userCpr && $lookedUpCpr) {
+      $this->auditLogger->info('DataLookup', 'User with cpr ' . $userCpr . ' looked up cpr ' . $lookedUpCpr);
+    }
 
     return $cprLookupResult;
   }