diff --git a/src/de/steamwar/bungeecore/commands/PollresultCommand.java b/src/de/steamwar/bungeecore/commands/PollresultCommand.java
index cfebd66a..df77cb8b 100644
--- a/src/de/steamwar/bungeecore/commands/PollresultCommand.java
+++ b/src/de/steamwar/bungeecore/commands/PollresultCommand.java
@@ -46,7 +46,7 @@ public class PollresultCommand extends BasicCommand {
         ProxiedPlayer player = (ProxiedPlayer) sender;
 
         Map<String, Integer> voted = PollAnswer.getCurrentResults();
-        Message.send("POLLRESULT_HEADER", player, voted.values().stream().reduce(Integer::sum), PollSystem.getQuestion());
+        Message.send("POLLRESULT_HEADER", player, voted.values().stream().reduce(Integer::sum).orElse(0), PollSystem.getQuestion());
         for (Map.Entry<String, Integer> e: voted.entrySet()) {
             Message.send("POLLRESULT_LIST", sender, e.getKey(), e.getValue());
         }
diff --git a/src/de/steamwar/bungeecore/sql/PollAnswer.java b/src/de/steamwar/bungeecore/sql/PollAnswer.java
index 7d23c384..7a34476e 100644
--- a/src/de/steamwar/bungeecore/sql/PollAnswer.java
+++ b/src/de/steamwar/bungeecore/sql/PollAnswer.java
@@ -58,7 +58,7 @@ public class PollAnswer {
         return getResults.select(rs -> {
             Map<String, Integer> retMap = new HashMap<>();
             while (rs.next())
-                retMap.put(PollSystem.getAnswer(rs.getInt("Answer")), rs.getInt("Times"));
+                retMap.put(PollSystem.getAnswer(rs.getInt("Answer")-1), rs.getInt("Times"));
             return retMap;
         }, PollSystem.getQuestion());
     }