diff --git a/bottle.py b/bottle.py
index 9806efd03..406762f7f 100644
--- a/bottle.py
+++ b/bottle.py
@@ -1239,11 +1239,11 @@ def POST(self):
         self['_cgi.FieldStorage'] = data #http://bugs.python.org/issue18394#msg207958
         data = data.list or []
         for item in data:
-            if item.filename:
+            if item.filename is None:
+                post[item.name] = item.value
+            else:
                 post[item.name] = FileUpload(item.file, item.name,
                                              item.filename, item.headers)
-            else:
-                post[item.name] = item.value
         return post
 
     @property