From 12525c2111766702e42aa95156c7ef144c3ac91b Mon Sep 17 00:00:00 2001
From: Maik Musall <maik@selbstdenker.ag>
Date: Thu, 30 Jun 2016 12:11:12 +0200
Subject: [PATCH] Fix NPE in UUID primary key generation code when primary key
 isn't based on any prototype

---
 .../Sources/er/extensions/eof/ERXGenericRecord.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXGenericRecord.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXGenericRecord.java
index ff7f81f8d48..e4db50a6d59 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXGenericRecord.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXGenericRecord.java
@@ -776,7 +776,8 @@ public NSDictionary<String, Object> rawPrimaryKeyDictionary(boolean inTransactio
 	private NSDictionary<String, Object> createUuidPrimaryKey(NSArray<EOAttribute> primaryKeyAttributes) {
 		if (primaryKeyAttributes.count() == 1) {
 			EOAttribute primaryKeyAttribute = primaryKeyAttributes.objectAtIndex(0);			
-			if (primaryKeyAttribute.prototypeName().equals(uuidPrototypeName)) {
+			String prototypeName = primaryKeyAttribute.prototypeName();
+			if (prototypeName != null && prototypeName.equals(uuidPrototypeName)) {
 				return new NSDictionary<String, Object>(UUIDUtilities.generateAsNSData(), primaryKeyAttribute.name());
 			}
 		}