diff --git a/rss_ticker_overlay/cors_proxy.py b/rss_ticker_overlay/cors_proxy.py
index 1a60882..843a174 100644
--- a/rss_ticker_overlay/cors_proxy.py
+++ b/rss_ticker_overlay/cors_proxy.py
@@ -10,10 +10,11 @@ def proxy():
         return "Missing URL parameter", 400
 
     try:
-        response = requests.get(url)
+        response = requests.get(url, timeout=10)
+        content_type = response.headers.get('Content-Type', 'text/plain')
         headers = {
             'Access-Control-Allow-Origin': '*',
-            'Content-Type': response.headers['Content-Type']
+            'Content-Type': content_type
         }
         return Response(response.content, response.status_code, headers)
     except requests.exceptions.RequestException as e: