diff --git a/models.py b/models.py
index 61e8d2a..00fa79e 100644
--- a/models.py
+++ b/models.py
@@ -68,8 +68,11 @@ class Url(Model):
         if title is None:
             r = requests.get(url)
             if r.status_code == 200:
-                dom = BeautifulSoup(r.content, 'html.parser')
-                self.title = dom.title.string
+                if 'text/html' in r.headers['content-type']:
+                    dom = BeautifulSoup(r.content, 'html.parser')
+                    self.title = dom.title.string
+                else:
+                    self.title = r.headers['content-type']
             else:
                 self.title = "Error: HTTP %s" % r.status_code