diff --git a/src/routes/admin.js b/src/routes/admin.js
index 0c562ce7c8..9c80f45231 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -244,7 +244,7 @@ var user = require('./../user.js'),
 			});
 
 			app.get('/topics', function (req, res) {
-				topics.getAllTopics(10, null, function (topics) {
+				topics.getAllTopics(10, null, function (err, topics) {
 					res.json({
 						topics: topics,
 						notopics: topics.length === 0
diff --git a/src/sitemap.js b/src/sitemap.js
index 26be952b21..af15e3961e 100644
--- a/src/sitemap.js
+++ b/src/sitemap.js
@@ -43,7 +43,7 @@ var path = require('path'),
 				},
 				function(next) {
 					var topicUrls = [];
-					topics.getAllTopics(null, null, function(topics) {
+					topics.getAllTopics(null, null, function(err, topics) {
 						topics.forEach(function(topic) {
 							if (topic.deleted !== '1') {
 								topicUrls.push({
diff --git a/src/topics.js b/src/topics.js
index 89eb940c6d..237a315ea2 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -588,6 +588,10 @@ var RDB = require('./redis.js'),
 
 	Topics.getAllTopics = function(limit, after, callback) {
 		RDB.smembers('topics:tid', function(err, tids) {
+			if(err) {
+				return callback(err, null);
+			}
+
 			var topics = [],
 				numTids, x;
 
@@ -623,7 +627,7 @@ var RDB = require('./redis.js'),
 					next();
 				});
 			}, function(err) {
-				callback(topics);
+				callback(err, topics);
 			});
 		});
 	}
diff --git a/src/websockets.js b/src/websockets.js
index 2eeb1474e9..cdc38a9c49 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -13,7 +13,7 @@ var cookie = require('cookie'),
 		client: RDB,
 		ttl: 60 * 60 * 24 * 14
 	}),
-		
+
 	user = require('./user'),
 	Groups = require('./groups'),
 	posts = require('./posts'),
@@ -31,7 +31,7 @@ var cookie = require('cookie'),
 		'categories': require('./admin/categories'),
 		'user': require('./admin/user')
 	},
-	plugins = require('./plugins');	
+	plugins = require('./plugins');
 
 
 var users = {},
@@ -578,7 +578,7 @@ module.exports.init = function(io) {
 				}
 
 				posts.getTopicPostStats();
-				
+
 				io.sockets.in('topic_' + data.tid).emit('event:post_deleted', {
 					pid: data.pid
 				});
@@ -591,9 +591,9 @@ module.exports.init = function(io) {
 				if(err) {
 					return callback(err);
 				}
-				
+
 				posts.getTopicPostStats();
-				
+
 				io.sockets.in('topic_' + data.tid).emit('event:post_restored', {
 					pid: data.pid
 				});
@@ -861,7 +861,7 @@ module.exports.init = function(io) {
 		});
 
 		socket.on('api:admin.topics.getMore', function(data, callback) {
-			topics.getAllTopics(data.limit, data.after, function(topics) {
+			topics.getAllTopics(data.limit, data.after, function(err, topics) {
 				callback(JSON.stringify(topics));
 			});
 		});