diff --git a/src/core/client/framework/lib/relay/lookup.ts b/src/core/client/framework/lib/relay/lookup.ts
index d5a75c616..718dadcf9 100644
--- a/src/core/client/framework/lib/relay/lookup.ts
+++ b/src/core/client/framework/lib/relay/lookup.ts
@@ -36,7 +36,7 @@ const createProxy = <T = any>(
       return prop in recordSource;
     },
     get(_, prop) {
-      if (prop in recordSource && (recordSource as any)[prop].__ref) {
+      if ((recordSource as any)[prop] && (recordSource as any)[prop].__ref) {
         return lookup(environment, (recordSource as any)[prop].__ref);
       }
       return (recordSource as any)[prop];
diff --git a/src/core/client/framework/testHelpers/createFixture.ts b/src/core/client/framework/testHelpers/createFixture.ts
index 8b46357f8..7e163c012 100644
--- a/src/core/client/framework/testHelpers/createFixture.ts
+++ b/src/core/client/framework/testHelpers/createFixture.ts
@@ -8,16 +8,16 @@ import { DeepPartial } from "coral-framework/types";
 export type Callbackify<T> = T extends object
   ?
       | {
-          [P in keyof T]: T[P] extends Array<infer U>
+          [P in keyof T]: T[P] extends (Array<infer U> | undefined)
             ? Array<Callbackify<U>>
-            : T[P] extends ReadonlyArray<infer V>
+            : T[P] extends (ReadonlyArray<infer V> | undefined)
             ? ReadonlyArray<Callbackify<V>>
             : Callbackify<T[P]>
         }
       | (() => {
-          [P in keyof T]: T[P] extends Array<infer U>
+          [P in keyof T]: T[P] extends (Array<infer U> | undefined)
             ? Array<Callbackify<U>>
-            : T[P] extends ReadonlyArray<infer V>
+            : T[P] extends (ReadonlyArray<infer V> | undefined)
             ? ReadonlyArray<Callbackify<V>>
             : Callbackify<T[P]>
         })
@@ -28,9 +28,9 @@ export type Callbackify<T> = T extends object
  */
 export type WithTypename<T> = T extends object
   ? {
-      [P in keyof T]: T[P] extends Array<infer U>
+      [P in keyof T]: T[P] extends (Array<infer U> | undefined)
         ? Array<WithTypename<U>>
-        : T[P] extends ReadonlyArray<infer V>
+        : T[P] extends (ReadonlyArray<infer V> | undefined)
         ? ReadonlyArray<WithTypename<V>>
         : WithTypename<T[P]>
     } & { __typename?: string }
diff --git a/src/core/common/types.ts b/src/core/common/types.ts
index 89b66e760..1ccecacc5 100644
--- a/src/core/common/types.ts
+++ b/src/core/common/types.ts
@@ -24,9 +24,9 @@ export type Nullable<T> = { [P in keyof T]: T[P] | null };
 
 export type DeepNullable<T> = T extends object
   ? {
-      [P in keyof T]: T[P] extends Array<infer U>
+      [P in keyof T]: T[P] extends (Array<infer U> | undefined)
         ? Array<DeepNullable<U>>
-        : T[P] extends ReadonlyArray<infer V>
+        : T[P] extends (ReadonlyArray<infer V> | undefined)
         ? ReadonlyArray<DeepNullable<V>>
         : DeepNullable<T[P]>
     }
@@ -37,9 +37,9 @@ export type DeepNullable<T> = T extends object
  */
 export type DeepPartial<T> = T extends object
   ? {
-      [P in keyof T]?: T[P] extends Array<infer U>
+      [P in keyof T]?: T[P] extends (Array<infer U> | undefined)
         ? Array<DeepPartial<U>>
-        : T[P] extends ReadonlyArray<infer V>
+        : T[P] extends (ReadonlyArray<infer V> | undefined)
         ? ReadonlyArray<DeepPartial<V>>
         : DeepPartial<T[P]>
     }