src/functions/poll.js

@@ -1,5 +1,6 @@
 export default function poll(bot) {
-  return bot.api.getUpdates(bot.update).then(response => {
+  return bot.api.getUpdates(bot.update)
+      .then(response => {
         if (!response.result.length) {
           return poll(bot);
         }
@@ -9,5 +10,9 @@ export default function poll(bot) {
           return null;
         }
         return poll(bot);
+      })
+      .catch(e => {
+        bot.emit('error', e);
+        return poll(bot);
       });
 }

src/index.js

@@ -75,7 +75,8 @@ export default class Bot extends EventEmitter {
     if (hook) {
       return webhook(hook, this);
     }
-    return this.api.getMe().then(response => {
+    return this.api.getMe()
+      .then(response => {
         this.info = response.result;
 
         this.on('update', this._update);
@@ -85,6 +86,10 @@ export default class Bot extends EventEmitter {
         }
 
         return poll(this);
+      })
+      .catch(e => {
+        this.emit('error', e);
+        throw e;
       });
   }
 
@@ -138,7 +143,11 @@ export default class Bot extends EventEmitter {
    * @return {unknown} returns the result of calling message's send method
    */
   send(message) {
-    return message.send(this);
+    return message.send(this)
+      .catch(e => {
+        this.emit('error', e);
+        throw e;
+      });
   }
 
   /**