diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js index d95228b9a3..802431735c 100644 --- a/public/src/forum/admin/users.js +++ b/public/src/forum/admin/users.js @@ -245,8 +245,8 @@ define(function() { socket.emit('user.loadMore', { set: set, after: $('#users-container').children().length - }, function(data) { - if (data.users.length) { + }, function(err, data) { + if (data && data.users.length) { onUsersLoaded(data.users); } loadingMoreUsers = false; diff --git a/public/src/forum/users.js b/public/src/forum/users.js index 28bc10a67b..de00f3bc38 100644 --- a/public/src/forum/users.js +++ b/public/src/forum/users.js @@ -126,8 +126,8 @@ define(function() { socket.emit('user.loadMore', { set: set, after: after - }, function(data) { - if (data.users.length) { + }, function(err, data) { + if (data && data.users.length) { onUsersLoaded(data.users, emptyContainer); $('#load-more-users-btn').removeClass('disabled'); } else {