diff --git a/jslib b/jslib
deleted file mode 160000
index 7fa5178b..00000000
--- a/jslib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7fa5178bff0a109c2f0691045c98fb8e0897a89e
diff --git a/jslib b/jslib
new file mode 120000
index 00000000..fb6536c9
--- /dev/null
+++ b/jslib
@@ -0,0 +1 @@
+../jslib
\ No newline at end of file
diff --git a/src/app/organizations/manage/collections.component.ts b/src/app/organizations/manage/collections.component.ts
index 03a81841..d3374f7e 100644
--- a/src/app/organizations/manage/collections.component.ts
+++ b/src/app/organizations/manage/collections.component.ts
@@ -85,7 +85,7 @@ export class CollectionsComponent implements OnInit {
     }
 
     loadMore() {
-        if (this.collections.length <= this.pageSize) {
+        if (!this.collections || this.collections.length <= this.pageSize) {
             return;
         }
         const pagedLength = this.pagedCollections.length;
@@ -185,7 +185,7 @@ export class CollectionsComponent implements OnInit {
         if (searching && this.didScroll) {
             this.resetPaging();
         }
-        return !searching && this.collections.length > this.pageSize;
+        return !searching && this.collections && this.collections.length > this.pageSize;
     }
 
     private removeCollection(collection: CollectionView) {
diff --git a/src/app/organizations/manage/groups.component.ts b/src/app/organizations/manage/groups.component.ts
index 732aef16..6a5b6dae 100644
--- a/src/app/organizations/manage/groups.component.ts
+++ b/src/app/organizations/manage/groups.component.ts
@@ -81,7 +81,7 @@ export class GroupsComponent implements OnInit {
     }
 
     loadMore() {
-        if (this.groups.length <= this.pageSize) {
+        if (!this.groups || this.groups.length <= this.pageSize) {
             return;
         }
         const pagedLength = this.pagedGroups.length;
@@ -179,7 +179,7 @@ export class GroupsComponent implements OnInit {
         if (searching && this.didScroll) {
             this.resetPaging();
         }
-        return !searching && this.groups.length > this.pageSize;
+        return !searching && this.groups && this.groups.length > this.pageSize;
     }
 
     private removeGroup(group: GroupResponse) {
diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts
index 43f3d68b..8913d1cb 100644
--- a/src/app/organizations/manage/people.component.ts
+++ b/src/app/organizations/manage/people.component.ts
@@ -129,7 +129,7 @@ export class PeopleComponent implements OnInit {
     }
 
     loadMore() {
-        if (this.users.length <= this.pageSize) {
+        if (!this.users || this.users.length <= this.pageSize) {
             return;
         }
         const pagedLength = this.pagedUsers.length;
@@ -331,7 +331,7 @@ export class PeopleComponent implements OnInit {
         if (searching && this.didScroll) {
             this.resetPaging();
         }
-        return !searching && this.users.length > this.pageSize;
+        return !searching && this.users && this.users.length > this.pageSize;
     }
 
     private async doConfirmation(user: OrganizationUserUserDetailsResponse) {