From 601c45ab1bb31286cd071002fac7de4d7b1eaaa5 Mon Sep 17 00:00:00 2001
From: WimVelzeboer <wimvelzeboer@protonmail.com>
Date: Tue, 10 May 2022 14:40:55 +0100
Subject: [PATCH] Avoid unexpected exceptions when the recordIds contains
 incorrect data

Signed-off-by: WimVelzeboer <wimvelzeboer@protonmail.com>
---
 .../classic/classes/fflib_ClassicDomainFactory.cls            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicDomainFactory.cls b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicDomainFactory.cls
index 2760453..10a7aad 100644
--- a/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicDomainFactory.cls
+++ b/sfdx-source/apex-extensions/main/application/classic/classes/fflib_ClassicDomainFactory.cls
@@ -104,6 +104,10 @@ public virtual class fflib_ClassicDomainFactory
 	 **/
 	public virtual fflib_IDomain newInstance(Set<Id> recordIds, Schema.SObjectType sObjectType)
 	{
+		// Avoid unexpected exceptions when the recordIds contains incorrect data
+		if (recordIds.isEmpty() || new List<Id>(recordIds).get(0) == null )
+			return newInstance(new List<SObject>(), sObjectType);
+
 		return newInstance(selectorFactory.selectById(recordIds));
 	}