diff --git a/test_tmdb.py b/test_tmdb.py
index e55d716..d58e661 100644
--- a/test_tmdb.py
+++ b/test_tmdb.py
@@ -67,9 +67,9 @@ class TestTmdbMethods(unittest.TestCase):
 
     def test_search_year(self):
         movie = Movie()
-        id = movie.search_title('Dune')
+        id = movie.search_title('Dune', 1984)
         self.assertEqual(id, 841)
-        id = movie.search_title('Dune', 2020)
+        id = movie.search_title('Dune')
         self.assertEqual(id, 438631)
 
     def test_split_year(self):
@@ -105,6 +105,11 @@ class TestTmdbMethods(unittest.TestCase):
         movie.search_title('The Flash')
         #self.assertEqual('Tom Cavanagh', movie.cast[0])
         self.assertEqual('Carlos Valdes', movie.cast[2])
+        
+    def test_poster_path(self):
+        movie = Movie()
+        id = movie.search_title('Dune')
+        self.assertEqual(movie.poster_url, "http://image.tmdb.org/t/p/w92/9HNZTw2D3cM1yA08FF5SeWEO9eX.jpg")
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tmdb/tmdb.py b/tmdb/tmdb.py
index c46a2db..b00f293 100644
--- a/tmdb/tmdb.py
+++ b/tmdb/tmdb.py
@@ -16,7 +16,7 @@ along with tmdb-bot.  If not, see <https://www.gnu.org/licenses/>.
 from html import escape
 import re
 
-from mautrix.types import TextMessageEventContent, MediaMessageEventContent, MessageType, Format
+from mautrix.types import TextMessageEventContent, MediaMessageEventContent, MessageType, Format, ImageInfo
 
 from maubot import Plugin, MessageEvent
 from maubot.handlers import command
@@ -74,12 +74,14 @@ class TmdbBot(Plugin):
         await evt.respond(content)
 
     async def send_image(self, evt: MessageEvent, title, image) -> None:
-        mxc_uri = await self.client.upload_media(image)
-        content = MediaMessageEventContent(
-            msgtype=MessageType.IMAGE,
-            body=f"Image {title}",
-            url=f"{mxc_uri}")
-        await evt.respond(content)
+        if image:
+            mxc_uri = await self.client.upload_media(image)
+            content = MediaMessageEventContent(
+                msgtype=MessageType.IMAGE,
+                body=f"Image {title}",
+                url=f"{mxc_uri}",
+                info=ImageInfo(mimetype='image/jpg'))
+            await evt.respond(content)
 
     def construct_html_message(self, movie, overview_length = 200, cast_length = 3) -> str:
         if len(movie.overview) > overview_length: