diff --git a/src/services/batch-request-builder.ts b/src/services/batch-request-builder.ts
index a782b56c..75bfca86 100644
--- a/src/services/batch-request-builder.ts
+++ b/src/services/batch-request-builder.ts
@@ -26,7 +26,7 @@ export class BatchRequestBuilder implements RequestBuilder {
 
     const requests: OrganizationImportRequest[] = [];
 
-    if (users.length > 0) {
+    if (users?.length > 0) {
       const usersRequest = users.map((u) => {
         return {
           email: u.email,
@@ -48,7 +48,7 @@ export class BatchRequestBuilder implements RequestBuilder {
       }
     }
 
-    if (groups.length > 0) {
+    if (groups?.length > 0) {
       const groupRequest = groups.map((g) => {
         return {
           name: g.name,
diff --git a/src/services/sync.service.ts b/src/services/sync.service.ts
index 8e3172fc..c7c55d48 100644
--- a/src/services/sync.service.ts
+++ b/src/services/sync.service.ts
@@ -215,7 +215,7 @@ export class SyncService {
     users: UserEntry[],
     syncConfig: SyncConfiguration,
   ): OrganizationImportRequest[] {
-    if (syncConfig.largeImport && groups.length + users.length > batchSize) {
+    if (syncConfig.largeImport && (groups?.length ?? 0) + (users?.length ?? 0) > batchSize) {
       return this.batchRequestBuilder.buildRequest(groups, users, syncConfig);
     } else {
       return this.singleRequestBuilder.buildRequest(groups, users, syncConfig);