diff --git a/data/migrations/versions/5ad999136045_add_signature_storage.py b/data/migrations/versions/5ad999136045_add_signature_storage.py
index 6f5c36695..f306c58b8 100644
--- a/data/migrations/versions/5ad999136045_add_signature_storage.py
+++ b/data/migrations/versions/5ad999136045_add_signature_storage.py
@@ -37,6 +37,11 @@ def upgrade(tables):
     op.create_index('imagestoragesignature_storage_id', 'imagestoragesignature', ['storage_id'], unique=False)
     ### end Alembic commands ###
 
+    op.bulk_insert(tables.imagestoragetransformation,
+    [
+        {'id': 2, 'name':'aci'},
+    ])
+
     op.bulk_insert(tables.imagestoragesignaturekind,
     [
         {'id': 1, 'name':'gpg2'},
diff --git a/formats/aci.py b/formats/aci.py
index ff7753652..62a9995d2 100644
--- a/formats/aci.py
+++ b/formats/aci.py
@@ -146,8 +146,8 @@ class ACIImage(TarImageFormatter):
 
     # ACI requires that the execution command be absolutely referenced. Therefore, if we find
     # a relative command, we give it as an argument to /bin/sh to resolve and execute for us.
-    entrypoint = config.get('Entrypoint') or []
-    exec_path = entrypoint + config.get('Cmd') or []
+    entrypoint = config.get('Entrypoint', []) or []
+    exec_path = entrypoint + (config.get('Cmd', []) or [])
     if exec_path and not exec_path[0].startswith('/'):
       exec_path = ['/bin/sh', '-c', '""%s""' % ' '.join(exec_path)]