diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
index ee4bcc968..85502fd37 100644
--- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
+++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
@@ -203,9 +203,12 @@ public class CustomerSupport extends MiniPlugin implements ResultSetCallable
 						caller.sendMessage(C.cBlue + "Valentines Gifts Received  : " + C.cYellow + valentinesGiftsReceived);
 						caller.sendMessage(C.cBlue + "Monthly Bonus Log (Last 6 entries):");
 						
-						for (String logEntry : _accountBonusLog.get(client.getAccountId()))
+						if (_accountBonusLog.containsKey(client.getAccountId()))
 						{
-							caller.sendMessage(C.cYellow + logEntry);
+							for (String logEntry : _accountBonusLog.get(client.getAccountId()))
+							{
+								caller.sendMessage(C.cYellow + logEntry);
+							}							
 						}
 						
 						caller.sendMessage(C.cDGreen + C.Strike + "=============================================");
@@ -258,7 +261,8 @@ public class CustomerSupport extends MiniPlugin implements ResultSetCallable
 			accountId = resultSet.getInt(1);
 			log.add("Received " + resultSet.getInt(3) + " " + resultSet.getString(2) + " on " + resultSet.getDate(4));
 		}
-				
-		_accountBonusLog.put(accountId, log);
+		
+		if (accountId != 0)
+			_accountBonusLog.put(accountId, log);
 	}
 }