diff --git a/indexer/src/pkg.rs b/indexer/src/pkg.rs
index fcb416f..70c09d0 100644
--- a/indexer/src/pkg.rs
+++ b/indexer/src/pkg.rs
@@ -226,15 +226,17 @@ fn index_pkg<T: postgres::GenericClient>(tr: &mut T, mut opt: PkgOpt, pkgid: i32
 
 pub fn pkg<T>(conn: &mut T, opt: PkgOpt) where T: postgres::GenericClient {
     let mut tr = conn.transaction().unwrap();
+    let pkg = insert_pkg(&mut tr, &opt);
 
-    let (pkgid,verid) = match insert_pkg(&mut tr, &opt) { Some(x) => x, None => return };
     if unsafe { DRY_RUN } {
         return;
     }
 
-    if let Err(e) = index_pkg(&mut tr, opt, pkgid, verid) {
-        error!("Error reading package: {}", e);
-        return;
+    if let Some((pkgid,verid)) = pkg {
+        if let Err(e) = index_pkg(&mut tr, opt, pkgid, verid) {
+            error!("Error reading package: {}", e);
+            return;
+        }
     }
 
     if let Err(e) = tr.commit() {
diff --git a/indexer/src/sys_arch.rs b/indexer/src/sys_arch.rs
index 8c53b4d..8e1b65a 100644
--- a/indexer/src/sys_arch.rs
+++ b/indexer/src/sys_arch.rs
@@ -1,6 +1,5 @@
 use std::str::FromStr;
 use std::io::{Read,BufRead,BufReader,Result};
-use std::collections::HashSet;
 use regex::Regex;
 use chrono::NaiveDateTime;
 use postgres;