From 4a9498e105441557d9d99453c8141c297a7edfbd Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Wed, 1 Apr 2015 11:49:36 -0400
Subject: [PATCH] closes #2916

---
 src/rewards/admin.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/rewards/admin.js b/src/rewards/admin.js
index 30bed9e0e8..fac78bfeec 100644
--- a/src/rewards/admin.js
+++ b/src/rewards/admin.js
@@ -15,7 +15,7 @@ rewards.save = function(data, callback) {
 
 			data.id = id;
 			
-			async.waterfall([
+			async.series([
 				function(next) {
 					rewards.delete(data, next);
 				},
@@ -97,7 +97,7 @@ function saveConditions(data, callback) {
 		db.setAdd('conditions:active', conditions, callback);
 
 		async.each(Object.keys(rewardsPerCondition), function(condition, next) {
-			db.setAdd('condition:' + condition + ':rewards', rewardsPerCondition[condition]);
+			db.setAdd('condition:' + condition + ':rewards', rewardsPerCondition[condition], next);
 		}, callback);
 	});
 }
@@ -114,8 +114,10 @@ function getActiveRewards(callback) {
 				db.getObject('rewards:id:' + id + ':rewards', next);
 			}
 		}, function(err, data) {
-			data.main.rewards = data.rewards;
-			activeRewards.push(data.main);
+			if (data.main) {
+				data.main.rewards = data.rewards;
+				activeRewards.push(data.main);
+			}
 
 			next(err);
 		});