diff --git a/appservice.py b/appservice.py
index cc492af..505f866 100644
--- a/appservice.py
+++ b/appservice.py
@@ -62,16 +62,28 @@ def on_receive_events(transaction):
                 value = {"type": "photo", "version": "1.0"}
                 value["title"] = event['content']['body']
                 value["url"] = imgurl
-                value["width"] = event['content']['info']['w']
-                value["height"] = event['content']['info']['h']
+                if 'w' in event['content']['info']:
+                    value["width"] = event['content']['info']['w']
+                else:
+                    value["width"] = 200
+                if 'h' in event['content']['info']:
+                    value["height"] = event['content']['info']['h']
+                else:
+                    value["height"] = 200
                 if 'thumbnail_info' in event['content']['info']:
                     thmburl = app.config['MATRIX_HOST'] + '/_matrix/media/r0/download/' + event['content']['info']['thumbnail_url'][6:]
                     value["thumbnail_width"] = event['content']['info']['thumbnail_info']['w']
                     value["thumbnail_height"] = event['content']['info']['thumbnail_info']['h']
                     value["thumbnail_url"] = thmburl
                 else:
-                    value["thumbnail_width"] = event['content']['info']['w']
-                    value["thumbnail_height"] = event['content']['info']['h']
+                    if 'w' in event['content']['info']:
+                        value["thumbnail_width"] = event['content']['info']['w']
+                    else:
+                        value["thumbnail_width"] = 200
+                    if 'h' in event['content']['info']:
+                        value["thumbnail_height"] = event['content']['info']['h']
+                    else:
+                        value["thumbnail_height"] = 200
                     value["thumbnail_url"] = imgurl
                 rawitem = {"type": "io.pnut.core.oembed", "value": value}
                 embed = [rawitem]