From cb718dea417cab709ee17854c81f93a453222ab1 Mon Sep 17 00:00:00 2001
From: benji7425 <benji7425@outlook.com>
Date: Sun, 7 Jan 2018 23:48:29 +0000
Subject: [PATCH] 3.2.2

asdf
---
 CHANGELOG.md             | 4 ++++
 app/models/guild-data.js | 4 ++--
 discord-bot-core/Util.js | 2 +-
 package.json             | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f76b7c..593a087 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog
+## v3.2.2
+### Fixed
+- Fixed a couple of edge case errors
+
 ## v3.2.1
 ### Fixed
 - Fixed memory leak due to unconfigured discord.js caching
diff --git a/app/models/guild-data.js b/app/models/guild-data.js
index e3255ce..808f193 100644
--- a/app/models/guild-data.js
+++ b/app/models/guild-data.js
@@ -16,7 +16,7 @@ module.exports = class GuildData extends Core.BaseGuildData {
 		return Promise.all(
 			this.feeds
 				.filter(feed => feedIsActive(feed, guild))
-				.map(feed => feed.updatePastPostedLinks(guild))
+				.map(feed => feed.updatePastPostedLinks(guild).catch(err => null))
 		);
 	}
 
@@ -24,7 +24,7 @@ module.exports = class GuildData extends Core.BaseGuildData {
 		return Promise.all(
 			this.feeds
 				.filter(feed => feedIsActive(feed, guild))
-				.map(feed => feed.fetchLatest(guild))
+				.map(feed => feed.fetchLatest(guild).catch(err => null))
 		);
 	}
 };
diff --git a/discord-bot-core/Util.js b/discord-bot-core/Util.js
index 708edec..3f97b8d 100644
--- a/discord-bot-core/Util.js
+++ b/discord-bot-core/Util.js
@@ -17,7 +17,7 @@ function ask(client, textChannel, member, question) {
 		const askTimeout = setTimeout(cancelAsk, InternalConfig.askTimeout);
 
 		const handler = responseMessage => {
-			if (responseMessage.channel.id === textChannel.id && responseMessage.member.id === member.id) {
+            if (responseMessage.channel.id === textChannel.id && responseMessage.member && responseMessage.member.id === member.id) {
 				clearTimeout(askTimeout);
 				resolve(responseMessage);
 			}
diff --git a/package.json b/package.json
index dbe9a63..b6a76bf 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "3.2.1",
+	"version": "3.2.2",
 	"main": "app/index.js",
 	"scripts": {
 		"postinstall": "cd ./discord-bot-core && npm install",