diff --git a/setup.py b/setup.py
index 76377ce..6a8c59e 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
 	name='RcGcDw',
-	version='1.14.0.1',
+	version='1.15.0.2',
 	url='https://gitlab.com/piotrex43/RcGcDw/',
 	license='GNU GPLv3',
 	author='Frisk',
diff --git a/src/discord/message.py b/src/discord/message.py
index af89410..d4a5499 100644
--- a/src/discord/message.py
+++ b/src/discord/message.py
@@ -77,6 +77,8 @@ class DiscordMessage:
 			self.embed["author"]["icon_url"] = settings["event_appearance"][self.event_type]["icon"]
 		if len(self.embed["title"]) > 254:
 			self.embed["title"] = self.embed["title"][0:253] + "…"
+		if not self.embed["author"].get("icon_url", None) and self.embed["author"].get("icon_url", None) is not None:
+			self.embed["author"]["icon_url"] = None
 
 	def set_author(self, name, url, icon_url=None):
 		self.embed["author"]["name"] = name
@@ -89,7 +91,7 @@ class DiscordMessage:
 		self.embed["fields"].append(dict(name=name, value=value, inline=inline))
 
 	def set_avatar(self, url):
-		self.webhook_object["avatar_url"] = url
+		self.webhook_object["avatar_url"] = url or None
 
 	def set_name(self, name):
 		self.webhook_object["username"] = name
diff --git a/src/discussions.py b/src/discussions.py
index 2e9622d..e474013 100644
--- a/src/discussions.py
+++ b/src/discussions.py
@@ -32,6 +32,7 @@ from src.api.hooks import formatter_hooks, pre_hooks, post_hooks
 from src.i18n import formatters_i18n
 
 
+
 # Create a custom logger
 
 discussion_logger = logging.getLogger("rcgcdw.disc")