diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 8cd6b0e3..27431c39 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -967,6 +967,9 @@ def main():
                 break
         if not found:
             if options.create_metadata:
+                if 'name' not in apk:
+                    logging.error(apk['id'] + ' does not have a name! Skipping...')
+                    continue
                 f = open(os.path.join('metadata', apk['id'] + '.txt'), 'w')
                 f.write("License:Unknown\n")
                 f.write("Web Site:\n")