diff --git a/rowers/uploads.py b/rowers/uploads.py
index 6eaf087c..e263b7bf 100644
--- a/rowers/uploads.py
+++ b/rowers/uploads.py
@@ -209,7 +209,8 @@ def upload_options(body):
                 if 'priva' in lowkey:
                     uploadoptions = getboolean(uploadoptions,value,'makeprivate')
         except AttributeError:
-            pass
+            #pass
+            raise yaml.YAMLError
     except yaml.YAMLError as exc:
         try:
             uploadoptions = getplotoptions_body2(uploadoptions,body)
diff --git a/rowers/views.py b/rowers/views.py
index 542c5ad0..b1671b67 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -513,7 +513,10 @@ def get_thumbnails(request,id):
     charts = []
     
     charts = thumbnails_set(r,id,favorites)
-    if charts[0]['script'] == '': 
+    try:
+        if charts[0]['script'] == '': 
+            charts = []
+    except IndexError:
         charts = []