diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5ed3f7..7cfde7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+**0.2.2**
+- Fixed #49
+
 **0.2.1**
 - Fixed #40
 - Changed license from GPL v3 to MIT
diff --git a/pom.xml b/pom.xml
index 26385b5..3ca5499 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>tech.ailef</groupId>
 	<artifactId>snap-admin</artifactId>
-	<version>0.2.1</version>
+	<version>0.2.2</version>
 	<name>SnapAdmin</name>
 	<description>SnapAdmin is an auto-generated CRUD admin panel for Spring Boot/JPA apps</description>
 	<properties>
diff --git a/src/main/resources/templates/snapadmin/model/create.html b/src/main/resources/templates/snapadmin/model/create.html
index e9f6b1e..aa09675 100644
--- a/src/main/resources/templates/snapadmin/model/create.html
+++ b/src/main/resources/templates/snapadmin/model/create.html
@@ -43,7 +43,7 @@ <h3 class="fw-bold mb-4" th:text="${create ? schema.getJavaClass().getSimpleName
 										<th:block th:if="${field.isForeignKey()}">
 											<div th:replace="~{snapadmin/fragments/forms :: input_autocomplete(field=${field},  value=${
 												create ? (params != null ? params.getOrDefault(field.getName(), '') : '') 
-														 : (object != null ? object.traverse(field).getPrimaryKeyValue() : '' )
+														 : (object != null && object.traverse(field) != null ? object.traverse(field).getPrimaryKeyValue() : '' )
 											})}">
 											</div>
 										</th:block>