diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismMarshaller.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismMarshaller.java
index d3feebc5dd3..4d5ca86f9ba 100644
--- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismMarshaller.java
+++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismMarshaller.java
@@ -404,7 +404,7 @@ private <T> XNode serializePropertyValue(@NotNull PrismPropertyValue<T> value, P
             return serializePolyString((PolyString) realValue);
         } else if (beanMarshaller.canProcess(typeName)) {
             XNode xnode = beanMarshaller.marshall(realValue);
-            if (realValue.getClass().getPackage() != null) {
+            if (realValue != null && realValue.getClass().getPackage() != null) {
 				TypeDefinition typeDef = getSchemaRegistry()
 						.findTypeDefinitionByCompileTimeClass(realValue.getClass(), TypeDefinition.class);
 				if (xnode != null && typeDef != null && !QNameUtil.match(typeDef.getTypeName(), typeName)) {