diff --git a/rowers/uploads.py b/rowers/uploads.py
index 8dab7755..ea29c505 100644
--- a/rowers/uploads.py
+++ b/rowers/uploads.py
@@ -191,7 +191,7 @@ def upload_options(body):
     body = cleanbody(body)
     try:
         yml = (yaml.load(body))
-        if 'fromuploadform' in yml:
+        if yml and 'fromuploadform' in yml:
             return yml
         try:
             for key, value in yml.iteritems():