diff --git a/builder/kojid b/builder/kojid
index ebf7c49f..9a75bbff 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -1544,11 +1544,11 @@ class BuildTask(BaseTaskHandler):
         # get list of arches to build for
         buildconfig = session.getBuildConfig(build_tag)
         arches = buildconfig['arches']
-        tag_archlist = [koji.canonArch(a) for a in arches.split()]
-        self.logger.debug('arches: %s' % arches)
-        if arches is None:
+        if not arches:
             #XXX - need to handle this better
             raise koji.BuildError, "No arches for tag %(name)s [%(id)s]" % buildconfig
+        tag_archlist = [koji.canonArch(a) for a in arches.split()]
+        self.logger.debug('arches: %s' % arches)
         if extra:
             self.logger.debug('Got extra arches: %s' % extra)
             arches = "%s %s" % (arches,extra)
diff --git a/cli/koji b/cli/koji
index 3fd1ea8a..20b39dd2 100755
--- a/cli/koji
+++ b/cli/koji
@@ -1854,7 +1854,7 @@ def handle_add_target(options, session, args):
     name = args[0]
     build_tag = args[1]
     if len(args) > 2:
-        dest_tag = args[3]
+        dest_tag = args[2]
     else:
         #most targets have the same name as their destination
         dest_tag = name