diff --git a/binstar_client/inspect_package/conda.py b/binstar_client/inspect_package/conda.py
index 161d47bb..7743e4f5 100644
--- a/binstar_client/inspect_package/conda.py
+++ b/binstar_client/inspect_package/conda.py
@@ -101,8 +101,10 @@ def _load(filename, default=None):
         icon_b64 = data_uri_from(icon_path)
 
     subdir = get_subdir(index)
-    machine = index['arch']
-    operatingsystem = os_map.get(index['platform'], index['platform'])
+    machine = index.get('arch', None)
+    platform = index.get('platform', None)
+
+    operatingsystem = os_map.get(platform, platform)
 
     package_data = {
         'name': index.pop('name'),